Merge "Fix N_SE-10050" into 2.0_beta