MOSYNC-2950 Modifications after code review