Merge branch 'k.o/for-4.6-rc' into testing/4.6