This syncs the corresponding code with cluster branch
-enterprise
-cluster
short_version
vm_app_version
fe445f753b