Merge "fixed N_SE-8752" into 2.0_beta