Resolve "Hotfixes aus Master auf Development übertragen"

Ghost Userrequested to merge
675-hotfixes-aus-master-auf-development-ubertragen into development

Closes #675 (closed)

Edited by Ghost User

Merge request reports