These changes are made for the VSM sync with the OpenStack.