Merge tag 'v5.2' into perf/core, to pick up fixes