Merge branches 'misc' and 'rxe' into k.o/for-4.8-1