Merge "Fix N_SE-9270,N_SE-9282 and the max limition string" into 2.0_beta