MOSYNC-3118. Changes made after code review.