MOSYNC-2848. Changes made related to the code review suggestions.