Commits

Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4 Pick up the late fixes from the 4.3 cycle so we have them in our next branch.
Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4 Pick up the late fixes from the 4.3 cycle so we have them in our next branch.