Merge "Add Some Vars to Adjust Holmes to DCAE Bootstrap"