MOSYNC-2899 Part Two