Merge branch 'misc-fixes' into k.o/for-4.8-rc