Merge "Move comments to the previous line"