Merge branch 'for-3.0' into for-3.1