Merge "Add a prefix variable to defaults as blank"