Build 4062 : Comment copy bug fixed, code optimization, etc