Opened a PR for the first one https://github.com/umbraco/Umbraco-CMS/pull/13329 I'll add a few questions there because there are now inconsistencies