Merge remote-tracking branch 'origin/morph-develop' into stoewer
Some small bugs fixed
Merged branch stoewer into morph-develop