Merge "fix bug : N_SE-647 patchset7. remove merge conflict" into 2.0_beta