Nabi issue resolution N_SE-37733 and N_SE-38202