Merge branch 't/misc_cleanups'