MOSYNC-2682
Merge pull request #330 from emmaTresanszki/ThreeTwoOne

MOSYNC-2682