Backport/1708

https://www.openproject.org/work_packages/14656