Merge "Remove empty line comments"