Develop

Merged lukas leufen requested to merge develop into lukas_issue448_feat_load-model-from-path

Merge request reports