Commit dd55bc7a authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch 'development' into '913-resultloader-needs-to-be-fixed'

Development

See merge request !1491
parents 6e3103bd 59da7150