Part of MOSYNC-2459