Feature/unified none type

https://www.openproject.org/work_packages/2520. Changelog is left out, as of now.