Merge "Nabi issue N_SE-49172, N_SE-49295, N_SE-49175, N_SE-49183, N_SE-48987 resoluti...