Merge "copy paste comment should probably have end instead of start"