Merge branch 'for-3.2/core' into for-3.2/drivers