Co-authored-by: neriousy <34747899+neriousy@users.noreply.github.com>
Requested by Sebastian Herrlinger (@kommander). Rebased onto current v2 with conflicts resolved and all required checks passing.
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Kit Langton <kit.langton@gmail.com>
Fix #38010