Fix/4008 on release 3.0

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