MOSYNC-3229

MOSYNC-3229 - fixed
Code reviewer: Ciprian Filipas