Merge tag 'v4.5-rc6' into core/resources, to resolve conflict