Merge branch 'fixes-for-v4.12' into next