MOSYNC-3131. Changes after code review.