Merge "Fix N_SE-17884,N_SE-13031,N_SE-13756,N_SE-17900 ."