Merge tag 'v4.3-rc2' into k.o/for-4.3-v1