DAR-2565 fixing whitespaces after merge