Merge "fix bug : N_SE-7992, 8049, 7809, 7661 patchset2. fix more." into 2.0_beta