Merge branch 'wr-cleanup' into k.o/for-4.4