Fixed Nabi Issues N_SE-56966,56735