Merge branch 'bna-cleanups'