little changes!
Merge remote-tracking branch 'origin/ge-4.4' into ge-4.4
Some little adjustments!