Fix for Issue N_SE-45108, N_SE-45069, N_SE-44843