Merge "Add config to display VM number as default number of CF"