Merge "default sizing VM for CP"