MOSYNC-2027 Modifications after code review
Merge remote-tracking branch 'bogdan/ThreeThree' into ThreeThree
Merge remote-tracking branch 'emma/ThreeThree' into ThreeThree