Merge "bugfix: undefined variables"