Merge "Fix substitution mapping assigned value to nodetemplate"