Refactoring to prepare for the set var command
Merge remote-tracking branch 'origin/master'