Merge branch 'bnxt_en-bug-fixes'