Merge branch 'for-3.2' into for-3.3