Merge branch 'bna-fixes'