Merge branch 'for-3.12' into for-next