Merge "Fix N_SE-12125,N_SE-10514 and N_SE-9938"