Merge tag 'v4.7-rc5' into perf/core, to pick up fixes