Merge branch 't/misc'