MOSYNC-3092 Modifications after code review