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