Merge dev to dev-angular

https://openproject.org/work_packages/8411