Merge tag 'v3.15-rc1' into for-3.16/core