Merge MOSYNC-3113, MOSYNC-3221, MOSYNC-3224

Requesting merge for MOSYNC-3113, MOSYNC-3221, MOSYNC-3224.