Fixed Nabi Issues N_SE-56716,56589