Patch rolled back in order to allow vars in the changeset/branch field