cherry picking ord-nas's bug fix from master