Here's the PR https://github.com/umbraco/Umbraco-CMS/pull/11375 Does the cherry picking work backwards to v8 too? Just realised it could be done there too. When I do the others I will do them in v8 first