Removing relicts of Variables
Merge branch 'develop' into release-1.9.0