Merge branch 'k.o/for-4.10-rc' into HEAD