Merge "Fixing whitespace as per review"