Backport/1615

Backport of PR #1615 

see: https://www.openproject.org/work_packages/14339