Fixed issue with confusion of user variables.
Merge branch 'HotFix_60' into aws_staging