Fixed Nabi issues N_SE-39262, N_SE-39349, N_SE-38797