Merge "Remove trailing whitespaces in regular file"