Merge "fixed N_SE-16682"