Merge branch 'i40iw' into k.o/for-4.8