Hi @Sebastiaan , This PR of mine: https://github.com/umbraco/Umbraco-CMS/pull/14617#event-10112841696 is open for some time now, would love to know when this will be reviewed. I have some time on my hands this week, so I can work on any improvements / fixes if needed.