Merge branch 'for-3.4'