Merge "Add support for multiple variables in core definition"