Merge "N_SE-8235" into 2.0_beta