MOSYNC-2027 Modifications after code review