Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4