Merge branch 'for-3.1' into for-3.2