Collaboration work

STARS-891

STARS-891