Merge "Fix N_SE-8316,N_SE-5455" into 2.0_beta