Merge "Fix N_SE-11040 and N_SE-11346"