Merge branch 'apertis/v2023dev1' into apertis/v2021-updates
Fixes: https://phabricator.apertis.org/T8488