Backport/1060 1074

Part of: https://www.openproject.org/work_packages/12295