Merge branch 'nd/misc-cleanups'