🟡 v2023.5 entered Soft Feature Freeze, no additional features will be accepted • schedule
Backport !7 (merged) to v2022
Fixes: https://phabricator.apertis.org/T8519