Merge "Modify comment which does not conform to code"