Merge branch 'for-3.7' into next