Merge branch 'topic/for-4.12' into for-next