Merge remote-tracking branch 'origin/4.14' into 4.15
diff --git a/source/_global.rst b/source/_global.rst
index e1f4a83..b53f524 100644
--- a/source/_global.rst
+++ b/source/_global.rst
@@ -19,25 +19,25 @@
 
 .. _CloudStack Installation Guide: http://docs.cloudstack.apache.org/projects/cloudstack-installation
 .. _CloudStack Administrator's Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration
-.. _CloudStack Apidocs: http://cloudstack.apache.org/docs/api/
+.. _CloudStack Apidocs: https://cloudstack.apache.org/api.html
 
 .. |documentation_home| replace:: http://docs.cloudstack.apache.org/
 
 .. Latest version systemvm template name
 
-.. |sysvm64-version|     replace:: 4.14.0
-.. |sysvm64-name-xen|    replace:: systemvm-xenserver-4.14.0
-.. |sysvm64-name-kvm|    replace:: systemvm-kvm-4.14.0
-.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.14.0
-.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.14.0
-.. |sysvm64-name-ovm|    replace:: systemvm-ovm-4.14.0
+.. |sysvm64-version|     replace:: 4.15.0
+.. |sysvm64-name-xen|    replace:: systemvm-xenserver-4.15.0
+.. |sysvm64-name-kvm|    replace:: systemvm-kvm-4.15.0
+.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.15.0
+.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.15.0
+.. |sysvm64-name-ovm|    replace:: systemvm-ovm-4.15.0
 
 .. Latest version systemvm template URL
-.. |sysvm64-url-xen|    replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-xen.vhd.bz2
-.. |sysvm64-url-kvm|    replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-vmware.ova
-.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-hyperv.vhd.zip
-.. |sysvm64-url-ovm|    replace:: http://download.cloudstack.org/systemvm/4.14/systemvmtemplate-4.14.0-ovm.raw.bz2
+.. |sysvm64-url-xen|    replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-xen.vhd.bz2
+.. |sysvm64-url-kvm|    replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-vmware.ova
+.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-hyperv.vhd.zip
+.. |sysvm64-url-ovm|    replace:: http://download.cloudstack.org/systemvm/4.15/systemvmtemplate-4.15.0-ovm.raw.bz2
 
 .. Version specific: 4.5 systemvm template URL
 .. |acs45-sysvm64-url-xen|    replace:: http://download.cloudstack.org/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
@@ -56,4 +56,4 @@
 
 .. |br| raw:: html
 
-   <br/>
\ No newline at end of file
+   <br/>
diff --git a/source/_static/images/vapps-deployment-opts.png b/source/_static/images/vapps-deployment-opts.png
new file mode 100644
index 0000000..8d67664
--- /dev/null
+++ b/source/_static/images/vapps-deployment-opts.png
Binary files differ
diff --git a/source/_static/images/vapps-eulas.png b/source/_static/images/vapps-eulas.png
new file mode 100644
index 0000000..f00a8e8
--- /dev/null
+++ b/source/_static/images/vapps-eulas.png
Binary files differ
diff --git a/source/_static/images/vapps-networks.png b/source/_static/images/vapps-networks.png
new file mode 100644
index 0000000..688c28d
--- /dev/null
+++ b/source/_static/images/vapps-networks.png
Binary files differ
diff --git a/source/_static/images/vapps-properties.png b/source/_static/images/vapps-properties.png
new file mode 100644
index 0000000..0784b68
--- /dev/null
+++ b/source/_static/images/vapps-properties.png
Binary files differ
diff --git a/source/adminguide/accounts.rst b/source/adminguide/accounts.rst
index 2a3f2c7..a83bcd1 100644
--- a/source/adminguide/accounts.rst
+++ b/source/adminguide/accounts.rst
@@ -101,19 +101,34 @@
 Using Dynamic Roles
 -------------------
 
-In addition to the four default roles, the dynamic role-based API checker feature
+In addition to the default roles, the dynamic role-based API checker feature
 allows CloudStack root admins to create new roles with customized permissions.
 The allow/deny rules can be configured dynamically during runtime without
 restarting the management server(s).
 
 For backward compatiblity, all roles resolve to one of the four role types:
 admin, resource admin, domain admin and user. A new role can be created using
-the roles tab in the UI and specifying a name, a role type and optionally a
-description.
+the roles tab in the UI and specifying a name, either a role type or ID of existing
+role, and optionally a description. When a new role is created using ID of existing
+role, all the rules of the existing role are copied to the new role and these rules
+can be modified as desired.
 
-Role specific rules can be configured through the rules tab on role specific
-details page. A rule is either an API name or a wildcard string that are one of
-allow or deny permission and optionally a description.
+Role specific rules can be either configured through the rules tab on role specific
+details page or imported from a CSV file while creating a new role with role type.
+A rule is either an API name or a wildcard string that are one of allow or deny
+permission and optionally a description. These rules can be exported to a
+CSV file, name defaulted to “<RoleName>_<RoleType>.csv”.
+
+CSV file format:
+
+.. parsed-literal::
+
+   rule,permission,description
+   <Rule1>,<Permission1>,<Description1>
+   <Rule2>,<Permission2>,<Description2> 
+   <Rule3>,<Permission3>,<Description3>
+   …
+   so on
 
 When a user makes an API request, the backend checks the requested API against
 configured rules (in the order the rules were configured) for the caller
diff --git a/source/adminguide/api.rst b/source/adminguide/api.rst
index 19ad8da..75df8a1 100644
--- a/source/adminguide/api.rst
+++ b/source/adminguide/api.rst
@@ -26,7 +26,7 @@
 The API has a REST-like query basis and returns results in XML or JSON.
 
 See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_
-and `the API Reference <http://cloudstack.apache.org/docs/api/>`_.
+and `the API Reference <https://cloudstack.apache.org/api.html>`_.
 
 
 Provisioning and Authentication API
diff --git a/source/adminguide/hosts.rst b/source/adminguide/hosts.rst
index 9262379..ae9a89c 100644
--- a/source/adminguide/hosts.rst
+++ b/source/adminguide/hosts.rst
@@ -593,6 +593,13 @@
 out-of-band management driver in CloudStack that uses ``ipmitool`` for performing
 IPMI 2.0 management operations.
 
+CloudStack also supports Redfish protocol for out-of-band management; Redfish provides an
+HTTP REST API to control servers and has been widely adopted on newer machines.
+The commands supported by CloudStack's Redfish out-of-band driver are the same supported by
+the IPMITOOL driver.
+
+Note: so far CloudStack officially supports Redfish protocol for Dell and Supermicro machines.
+
 Following are some global settings that control various aspects of this feature.
 
 .. cssclass:: table-striped table-bordered table-hover
@@ -605,6 +612,8 @@
 outofbandmanagement.ipmitool.path         /usr/bin/ipmitool               The out of band management ipmitool path used by the IpmiTool driver
 outofbandmanagement.ipmitool.retries      1                               The out of band management IpmiTool driver retries option -R
 outofbandmanagement.sync.poolsize         50                              The out of band management background sync thread pool size 50
+redfish.ignore.ssl                        true                            Default value is false, ensuring that the client requests validate the certificate when using SSL. If set to true the redfish client will ignore SSL certificate validation when sending requests to a Redfish server.
+redfish.use.https	                      true                            Use HTTPS/SSL for all connections.
 =======================================   =============================   ====================================================================================================
 
 A change in ``outofbandmanagement.sync.poolsize`` settings requires restarting of
@@ -633,6 +642,11 @@
 If a host is in maintenance mode, Root admins are still allowed to perform
 power management actions but in the UI a warning is displayed.
 
+.. note::
+
+  IPMI based out-of-band management and Host HA may not work on Centos 8 using the default ipmitool version -
+  Installing ipmitool-1.8.18-12.el8_1.x86_64.rpm may solve the problem. Make sure to test the ipmitool on your physical equipment before using the IPMI-based out-of-band management and Host HA features.
+
 .. _host-security:
 
 Security
diff --git a/source/adminguide/locale/pot/api.pot b/source/adminguide/locale/pot/api.pot
index 70a1475..f14ae26 100644
--- a/source/adminguide/locale/pot/api.pot
+++ b/source/adminguide/locale/pot/api.pot
@@ -38,7 +38,7 @@
 
 #: ../../api.rst:31
 # 1f57015e966c480795b141ba3f87b86a
-msgid "See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ and `the API Reference <http://cloudstack.apache.org/docs/api/>`_."
+msgid "See `the Developer’s Guide <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ and `the API Reference <https://cloudstack.apache.org/api.html>`_."
 msgstr ""
 
 #: ../../api.rst:36
diff --git a/source/adminguide/locale/pot/troubleshooting.pot b/source/adminguide/locale/pot/troubleshooting.pot
index c9164fa..979a74e 100644
--- a/source/adminguide/locale/pot/troubleshooting.pot
+++ b/source/adminguide/locale/pot/troubleshooting.pot
@@ -173,7 +173,7 @@
 
 #: ../../troubleshooting.rst:132
 # 25bdb5c7a6a7454ea25d62c3f0a02c57
-msgid "For more information about the API syntax, see the API Reference at `http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_."
+msgid "For more information about the API syntax, see the API Reference at `https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`_."
 msgstr ""
 
 #: ../../troubleshooting.rst:137
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/api.mo b/source/adminguide/locale/zh_CN/LC_MESSAGES/api.mo
index c4abbf3..4028a5a 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/api.mo
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/api.mo
Binary files differ
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/api.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/api.po
index 8140b94..2f5ca2b 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/api.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/api.po
@@ -50,8 +50,8 @@
 msgid ""
 "See `the Developer’s Guide "
 "<https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ "
-"and `the API Reference <http://cloudstack.apache.org/docs/api/>`_."
-msgstr "参阅  `开发指南 <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ 和 `参考API <http://cloudstack.apache.org/docs/api/>`_."
+"and `the API Reference <https://cloudstack.apache.org/api.html>`_."
+msgstr "参阅  `开发指南 <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Development+101>`_ 和 `参考API <https://cloudstack.apache.org/api.html>`_."
 
 # de3d35bb699f45f495251ceb69a2c238
 #: ../../api.rst:36
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.mo b/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.mo
index e0f7201..ae671c5 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.mo
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.mo
Binary files differ
diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.po
index cd464f7..b042c29 100644
--- a/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.po
+++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/troubleshooting.po
@@ -205,9 +205,9 @@
 #: ../../troubleshooting.rst:132
 msgid ""
 "For more information about the API syntax, see the API Reference at "
-"`http://cloudstack.apache.org/docs/api/ "
-"<http://cloudstack.apache.org/docs/api/>`_."
-msgstr "关于更多的API语法信息,参见API参考`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_。"
+"`https://cloudstack.apache.org/api.html "
+"<https://cloudstack.apache.org/api.html>`_."
+msgstr "关于更多的API语法信息,参见API参考`https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`_。"
 
 # d1a32a2023024c72907911b8c7757cae
 #: ../../troubleshooting.rst:137
diff --git a/source/adminguide/projects.rst b/source/adminguide/projects.rst
index 010c3c3..899521f 100644
--- a/source/adminguide/projects.rst
+++ b/source/adminguide/projects.rst
@@ -32,17 +32,38 @@
 or you can restrict that ability to just CloudStack administrators. Once
 you have created a project, you become that project’s administrator, and
 you can add others within your domain to the project. CloudStack can be
-set up either so that you can add people directly to a project, or so
-that you have to send an invitation which the recipient must accept.
-Project members can view and manage all virtual resources created by
-anyone in the project (for example, share VMs). A user can be a member
-of any number of projects and can switch views in the CloudStack UI to
-show only project-related information, such as project VMs, fellow
-project members, project-related alerts, and so on.
+set up to either add people directly to a project, or to send an
+invitation which the recipient must accept. Project members can view
+and manage all virtual resources created by anyone in the project
+(for example, share VMs). A user can be a member of any number of projects
+and can switch views in the CloudStack UI to show only project-related information,
+such as project VMs, fellow project members, project-related alerts, and so on.
 
-The project administrator can pass on the role to another project
-member. The project administrator can also add more members, remove
-members from the project, set new resource limits (as long as they are
+From CloudStack 4.15 onwards, it is possible for a project to have
+multiple project administrators and to add/invite specific users of
+an account to a project in addition to adding accounts. By means of
+Project Roles associated with a user or an account of the project,
+it is possible to restrict access of users in a project, i.e., in
+addition to account-level roles, one can further restrict access to
+operations (or APIs) by associating a project-level role to the
+user or account. However, if an account has already been added, one will not
+be able to associate a role to a specific user of that account.
+
+**NOTE:** Project Roles work over Account level Roles. If a user/account is
+added to a project without a project role, it would imply that the
+user / account added will have access to all APIs that are made available
+by the Account level role. If there are no specific deny rules in the
+project role, it would again fallback onto the account-level role to decide
+whether the user has permissions to perform a specific action. It is also to be
+noted that Project roles are restrictive in nature, i.e., to say that, one may
+not allow a user to perform an operation that is NOT allowed at the Account level.
+Even if a rule is added at the project level, allowing such an action, it will not
+have any effect as the action will be prohibited by the Account Role.
+
+
+The project administrator can promote or demote a user in the project.
+The project administrator can also add more members, remove members
+from the project, set new resource limits (as long as they are
 below the global defaults set by the CloudStack administrator), and
 delete the project. When the administrator removes a member from the
 project, resources created by that user, such as VM instances, remain
@@ -63,7 +84,7 @@
 private template if the template’s owner will grant permission. A
 project can use any service offering or disk offering available in its
 domain; however, you can not create private service and disk offerings
-at the project level..
+at the project level.
 
 
 Configuring Projects
@@ -186,7 +207,7 @@
    parameter. |Edits parameters|
 
    .. cssclass:: table-striped table-bordered table-hover
-   
+
    +--------------------------+------------------------------------------------------------------------------------------------------------------------------+
    | max.project.public.ips   | Maximum number of public IP addresses that can be owned by any project in the cloud. See About Public IP Addresses.          |
    +--------------------------+------------------------------------------------------------------------------------------------------------------------------+
@@ -284,30 +305,15 @@
 
 #. In the left navigation, click Projects.
 
-#. In Select View, choose Projects.
-
 #. Click the name of the project you want to work with.
 
-#. Click the Invitations tab.
+#. Click on the `Add Account to Project` button. This will have 2 tabs, one to add account to the project and the other to add a user to the project. Here, we can specify the:
 
-#. In Add by, select one of the following:
+      - account or user and/or email id of the user to be invited,
+      - (Optional) the Role i.e, Admin or Regular that the user is to be added as, defualts to Regular role,
+      - (Optional) the Project role specifying the list of APIs the user is allowed/ denied access to
 
-   #. Account – The invitation will appear in the user’s Invitations tab
-      in the Project View. See Using the Project View.
-
-   #. Email – The invitation will be sent to the user’s email address.
-      Each emailed invitation includes a unique code called a token
-      which the recipient will provide back to CloudStack when accepting
-      the invitation. Email invitations will work only if the global
-      parameters related to the SMTP server have been set. See
-      `“Setting Up Invitations” <#setting-up-invitations>`_.
-
-#. Type the user name or email address of the new member you want to
-   add, and click Invite. Type the CloudStack user name if you chose
-   Account in the previous step. If you chose Email, type the email
-   address. You can invite only people who have an account in this cloud
-   within the same domain as the project. However, you can send the
-   invitation to any email address.
+   You can invite only people who have an account in this cloud within the same domain as the project. However, you can send the invitation to any email address.
 
 #. To view and manage the invitations you have sent, return to this tab.
    When an invitation is accepted, the new member will appear in the
@@ -332,12 +338,13 @@
 
 #. Click the name of the project you want to work with.
 
-#. Click the Accounts tab. The current members of the project are
-   listed.
+#. Click on the `Add Account to Project` button. This will have 2 tabs, one to add account to the project and the other to add a user to the project. Here, we can specify the:
 
-#. Type the account name of the new member you want to add, and click
-   Add Account. You can add only people who have an account in this
-   cloud and within the same domain as the project.
+      - account or user and/or email id of the user to be invited,
+      - (Optional) the Role i.e, Admin or Regular that the user is to be added as, defualts to Regular role,
+      - (Optional) the Project role specifying the list of APIs the user is allowed/ denied access to
+
+#. You can add only people who have an account in this cloud and within the same domain as the project.
 
 
 Accepting a Membership Invitation
@@ -346,11 +353,11 @@
 If you have received an invitation to join a CloudStack project, and you
 want to accept the invitation, follow these steps:
 
-#. Log in to the CloudStack UI.
+#. Log in to the CloudStack’s UI.
 
 #. In the left navigation, click Projects.
 
-#. In Select View, choose Invitations.
+#. Click on the Project Invitations button
 
 #. If you see the invitation listed onscreen, click the Accept button.
 
@@ -410,12 +417,9 @@
 
    -  Click the Accounts tab to view and manage project members. If you
       are the project administrator, you can add new members, remove
-      members, or change the role of a member from user to admin. Only
-      one member at a time can have the admin role, so if you set
-      another user’s role to admin, your role will change to regular
-      user.
+      members, or change the role of a member from user to admin or vice versa.
 
-   -  (If invitations are enabled) Click the Invitations tab to view and
+   -  (If invitations are enabled) Click the Invitations button to view and
       manage invitations that have been sent to new project members but
       not yet accepted. Pending invitations will remain in this list
       until the new member accepts, the invitation timeout is reached,
diff --git a/source/adminguide/service_offerings.rst b/source/adminguide/service_offerings.rst
index 93c84f5..391f856 100644
--- a/source/adminguide/service_offerings.rst
+++ b/source/adminguide/service_offerings.rst
@@ -135,6 +135,9 @@
 
 -  Guest Networking type (virtual or direct)
 
+-  Root Disk size (optional). If not defined by CloudStack administrator,
+   users can set a custom Root disk size.
+
 -  Tags on the root disk
 
 The disk offering specifies:
@@ -341,6 +344,8 @@
       only specific zones can be selected.  One or more zones can be selected from 
       this list box by holding down the control key and clicking on the desired zones.
 
+   -  **Storage Policy**: Name of the storage policy defined at vCenter, this is applicable only for VMware.
+      When a specific Zone is selected, one of the storage policies can be selected from the list box.
 
 #. Click Add.
 
@@ -430,6 +435,9 @@
       only specific zones can be selected.  One or more zones can be selected from 
       this list box by holding down the control key and selecting the desired zones.
 
+   -  **Storage Policy**: Name of the storage policy defined at vCenter, this is applicable only for VMware.
+      When a specific Zone is selected, one of the storage policies can be selected from the list box.
+
 #. Click Add.
 
 .. [2] These options are dependant on the capabilities of the hypervisor or the shared storage system which the VMs are on.
diff --git a/source/adminguide/storage.rst b/source/adminguide/storage.rst
index 987dd5f..9993c29 100644
--- a/source/adminguide/storage.rst
+++ b/source/adminguide/storage.rst
@@ -29,7 +29,7 @@
 ---------------
 
 This section gives technical details about CloudStack
-primary storage. For more information about the concepts behind primary storage 
+primary storage. For more information about the concepts behind primary storage
 see :ref:`about-primary-storage` . For information about how to install and configure
 primary storage through the CloudStack UI, see the in the Installation Guide.
 
@@ -183,6 +183,28 @@
 secondary storage through the CloudStack UI, see the Advanced
 Installation Guide. about-secondary-storage>`_
 
+Migration of data between secondary storages is now supported. One may choose
+to completely migrate the data or migrate data such that the stores
+are balanced by choosing the appropriate Migration Policy. In order to facilitate
+distributing the migration load, SSVMs are spawned up if a file transfer takes
+more than a defined threshold. Following are the Global setting values to one may
+want to look at before proceeding with the migration task:
+
+
+   +----------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | Configuration Parameters         | Description                                                                                                                                                            |
+   +==================================+========================================================================================================================================================================+
+   | image.store.imbalance.threshold  | The storage imbalance threshold that is compared with the standard deviation percentage for a storage utilization metric. The value is a percentage in decimal format. |
+   +----------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | secstorage.max.migrate.sessions  | The max number of concurrent copy command execution sessions that an SSVM can handle                                                                                   |
+   +----------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | max.ssvm.count                   | Number of additional SSVMs to handle migration of data objects concurrently                                                                                            |
+   +----------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   | max.data.migration.wait.time     | Maximum wait time for a data migration task before spawning a new SSVM                                                                                                 |
+   +----------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+Secondary storages can also be set to read-only in order to cordon it off
+from being used for storing any further templates, volumes and snapshots.
 
 Working With Volumes
 --------------------
@@ -208,7 +230,7 @@
 template creation. Volumes are hypervisor-specific: a volume from one
 hypervisor type may not be used on a guest of another hypervisor type.
 
-.. note:: 
+.. note::
    CloudStack supports attaching up to
 
    - 13 data disks on XenServer hypervisor versions 6.0 and above,
@@ -386,9 +408,9 @@
 Detaching and Moving Volumes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note:: 
-   This procedure is different from moving volumes from one storage pool 
-   to another as described in `“VM Storage Migration” 
+.. note::
+   This procedure is different from moving volumes from one storage pool
+   to another as described in `“VM Storage Migration”
    <#vm-storage-migration>`_.
 
 A volume can be detached from a guest VM and attached to another guest.
@@ -417,9 +439,9 @@
 
 Supported in XenServer, KVM, and VMware.
 
-.. note:: 
-   This procedure is different from moving disk volumes from one VM to 
-   another as described in `“Detaching and Moving Volumes” 
+.. note::
+   This procedure is different from moving disk volumes from one VM to
+   another as described in `“Detaching and Moving Volumes”
    <#detaching-and-moving-volumes>`_.
 
 You can migrate a virtual machine’s root disk volume or any additional
@@ -440,10 +462,10 @@
 migrate a VM’s disks from one storage repository to another, all while
 the VM is running.
 
-.. note:: 
-   Because of a limitation in VMware, live migration of storage for a 
-   VM is allowed only if the source and target storage pool are 
-   accessible to the source host; that is, the host where the VM is 
+.. note::
+   Because of a limitation in VMware, live migration of storage for a
+   VM is allowed only if the source and target storage pool are
+   accessible to the source host; that is, the host where the VM is
    running when the live migration operation is requested.
 
 
@@ -475,7 +497,7 @@
    Moving Volumes” <#detaching-and-moving-volumes>`_ but skip the “reattach”
    step at the end. You will do that after migrating to new storage.
 
-#. Click the Migrate Volume button |Migrateinstance.png| and choose the 
+#. Click the Migrate Volume button |Migrateinstance.png| and choose the
    destination from the dropdown list.
 
 #. Watch for the volume status to change to Migrating, then back to
@@ -491,7 +513,7 @@
    Moving Volumes” <#detaching-and-moving-volumes>`_ but skip the “reattach”
    step at the end. You will do that after migrating to new storage.
 
-#. Click the Migrate Volume button |Migrateinstance.png| and choose the 
+#. Click the Migrate Volume button |Migrateinstance.png| and choose the
    destination from the dropdown list.
 
 #. Watch for the volume status to change to Migrating, then back to
@@ -520,12 +542,12 @@
 
 #. (KVM only) Stop the VM.
 
-#. Click the Migrate button |Migrateinstance.png| and choose the 
+#. Click the Migrate button |Migrateinstance.png| and choose the
    destination from the dropdown list.
 
-   .. note:: 
-      If the VM's storage has to be migrated along with the VM, this will 
-      be noted in the host list. CloudStack will take care of the storage 
+   .. note::
+      If the VM's storage has to be migrated along with the VM, this will
+      be noted in the host list. CloudStack will take care of the storage
       migration for you.
 
 #. Watch for the volume status to change to Migrating, then back to
@@ -595,6 +617,40 @@
 
 #. Click OK.
 
+Root Volume size defined via Service Offering
+~~~~~~~~~~~~~~~~
+
+If a Service Offering is created with a root disk size, then resizing the Root volume is possible only by resizing the VMs service offering.
+
+Service offering Root resizing constrains:
+
+#. Users cannot deploy VMs with custom root disk size when using such offerings
+
+#. Users cannot resize the VM root disk size when using such offerings
+
+#. The Root Volume of such VMs can only be resized when changing to another Service Offering with a Root disk size equals or larger than the current one.
+
+#. Users can change the VM offering to a service offering with a Root size of 0GB (default) and then customize the volume size.
+
+The following table shows possible combinations of Service offering supported resizing based on the offering Root disk size:
+
++---+----------------------------+---------------------------+-------------------------------+
+| # | Service Offering Root size | new Service Offering Root | Does support offering resize? |
++---+----------------------------+---------------------------+-------------------------------+
+| 1 | 0GB (default)              | Any                       | YES                           |
++---+----------------------------+---------------------------+-------------------------------+
+| 2 | 5GB                        | 5GB                       | YES                           |
++---+----------------------------+---------------------------+-------------------------------+
+| 3 | 5GB                        | 10GB                      | YES                           |
++---+----------------------------+---------------------------+-------------------------------+
+| 4 | 10GB                       | 5GB                       | NO                            |
++---+----------------------------+---------------------------+-------------------------------+
+| 5 | Any                        | 0GB                       | YES                           |
++---+----------------------------+---------------------------+-------------------------------+
+
+.. note::
+   Shrinking the Root disk is not supported via the service offering resizing workflow. All the combinations above assume a transition to Root disks with size equals or bigger than the original.
+   Service Offerings with Root size of 0GB do not change the disk size to Zero and indicates that the offering do not enforces a Root disk size.
 
 Reset VM to New Root Disk on Reboot
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -806,10 +862,10 @@
 properties file (\*.ova.meta) which it stored along with the original
 snapshot data.
 
-.. note:: 
-   For upgrading customers: This process applies only to newly created 
-   snapshots after upgrade to CloudStack 4.2. Snapshots that have already 
-   been taken and stored in OVA format will continue to exist in that 
+.. note::
+   For upgrading customers: This process applies only to newly created
+   snapshots after upgrade to CloudStack 4.2. Snapshots that have already
+   been taken and stored in OVA format will continue to exist in that
    format, and will continue to work as expected.
 
 
@@ -826,4 +882,4 @@
 .. |Migrateinstance.png| image:: /_static/images/migrate-instance.png
    :alt: button to migrate a volume.
 .. |volume-from-snap.PNG| image:: /_static/images/volume-from-snap.PNG
-   :alt: Offering is needed when creating a volume from the ROOT volume snapshot.   
+   :alt: Offering is needed when creating a volume from the ROOT volume snapshot.
diff --git a/source/adminguide/systemvm.rst b/source/adminguide/systemvm.rst
index a78ac7d..a5e7f5e 100644
--- a/source/adminguide/systemvm.rst
+++ b/source/adminguide/systemvm.rst
@@ -157,13 +157,21 @@
 guest. Both the administrator and end user web UIs offer a console
 connection.
 
-Clicking a console icon brings up a new window. The AJAX code downloaded
+Clicking a console icon brings up a new window. The console viewer
 into that window refers to the public IP address of a console proxy VM.
 There is exactly one public IP address allocated per console proxy VM.
-The AJAX application connects to this IP. The console proxy then proxies
+The viewer application connects to this IP. The console proxy then proxies
 the connection to the VNC port for the requested VM on the Host hosting
 the guest.
 
+Since 4.15, noVNC has been integrated into the console proxy and is the
+default viewer. It inherently supports multiple keyboard layouts configured
+in the guest virtual machine. Additionally, it can scale the display as
+well as paste into the console.
+
+noVNC is set as the default console viewer which be changed via the
+"novnc.console.default" global setting, which is set to true by default.
+
 .. note:: 
    The hypervisors will have many ports assigned to VNC usage so that 
    multiple VNC sessions can occur simultaneously.
diff --git a/source/adminguide/templates.rst b/source/adminguide/templates.rst
index deb6159..615f520 100644
--- a/source/adminguide/templates.rst
+++ b/source/adminguide/templates.rst
@@ -159,7 +159,7 @@
    -  **Name and Display Text**. These will be shown in the UI, so
       choose something descriptive.
 
-   -  **OS Type**. This helps CloudStack and the hypervisor perform
+   -  **OS Type**. (Except for VMware). This helps CloudStack and the hypervisor perform
       certain operations and make assumptions that improve the
       performance of the guest. Select one of the following.
 
@@ -177,6 +177,12 @@
             5.4 to support a CentOS 6.2 image will in general not work. 
             In those cases you should choose Other.
 
+         .. note::
+            Since version 4.15, VMware templates do not allow users or administrators
+            selecting an OS Type when registering a template. The OS Type is
+            obtained from the template after it is registered.
+
+
    -  **Public**. Choose Yes to make this template accessible to all
       users of this CloudStack installation. The template will appear in
       the Community Templates list. See `“Private and
@@ -192,6 +198,12 @@
 template creation process has been completed. The template is then
 available when creating a new VM.
 
+.. note::
+   Since version 4.15, CloudStack obtains information from the VMware templates
+   automatically at registration time. If a template contains different deployment
+   options (or configurations) as in the case of virtual appliances, then CloudStack
+   display the information required by the template, allowing users or administrators
+   to configure their instances.  
 
 Creating a Template from a Snapshot
 -----------------------------------
@@ -237,7 +249,7 @@
       available, or All Zones to make it available throughout
       CloudStack.
 
-   -  **OS Type**: This helps CloudStack and the hypervisor perform
+   -  **OS Type**: (Except for VMware). This helps CloudStack and the hypervisor perform
       certain operations and make assumptions that improve the
       performance of the guest. Select one of the following:
 
@@ -251,6 +263,11 @@
             support a CentOS 6.2 image will in general not work. In 
             those cases you should choose Other.
 
+         .. note::
+            Since version 4.15, VMware templates do not allow users or administrators
+            selecting an OS Type when registering a template. The OS Type is
+            obtained from the template after it is registered.
+
    -  **Hypervisor**: The supported hypervisors are listed. Select the
       desired one.
 
@@ -278,7 +295,10 @@
 Note that uploading multi-disk templates is also supported.
 
 .. note:: 
-            Templates corresponding to appliances with 'static properties' in the OVF (such as virtual appliances) are also supported. CloudStack stores any template properties in the OVF in the database after successful template installation. Once the template is ready, these properties are viewed by selecting the template and clicking on the 'OVF Properties' tab.
+   VMware only: If the selected template contains OVF properties, different deployment options or configurations,
+   multiple NICs or end-user license agreements, then the wizard will display these properties.
+
+   See `“Support for Virtual Appliances” <virtual_machines.html#support-for-virtual-appliances>`_.
 
 
 
@@ -294,6 +314,11 @@
 For this feature to work, your SSVMs must be supporting HTTPS (for more info please visit `“Using a SSL Certificate for the Console Proxy” 
 <systemvm.html#using-a-ssl-certificate-for-the-console-proxy>`_).
 
+.. note::
+   Since version 4.15, VMware templates do not allow users or administrators
+   selecting an OS Type when uploading a template. The OS Type is
+   obtained from the template after it is uploaded.
+
 Example GUI dialog of uploading Template/ISO from local (browser) is given below:
 
 |template-upload-from-local.PNG|
@@ -302,20 +327,23 @@
 
 Note that uploading multi-disk templates is also supported.
 
-Sharing templates with other accounts/projects
+Sharing templates and ISOs with other accounts/projects
 ----------------------------------------------
 
-When adding a template, the owner can choose to make template public or to keep it private. Once the template is created, the owner can choose to share this template so that other accounts/projects can also use the template. 
+When adding a template/ISO, the owner can choose to make template/ISO public or to keep it private. Once the template/ISO is created, the owner can choose to share this template/ISO so that other accounts/projects can also use the template/ISO. 
 
-Currently, the template owner can share his template with:
-  - other accounts inside his own domain (i.e. can't share the template with other accounts in the subdomain of his domain or any other domains)
+Currently, the owner can share his template/ISO with:
+  - other accounts inside his own domain (i.e. can't share the template/ISO with other accounts in the subdomain of his domain or any other domains)
   - projects where he belongs to (i.e. projects where he is the owner/creator or other projects where he has been joined)
 
-Template permissions can be changed via updateTemplatePermissions API call or via GUI. It is supported to add, remove or reset (remove all) template permissions.
+Template/ISO permissions can be changed via updateTemplatePermissions/updateIsoPermissions API call or via GUI. It is supported to add, remove or reset (remove all) template/ISO permissions.
 
-When adding or removing permissions to/from a template, it is required to specify account/project name which is being added/removed from the template permissions. 
+When adding or removing permissions to/from a template/ISO, it is required to specify account/project name which is being added/removed from the template/ISO permissions. 
 
-Global setting "allow.user.view.all.domain.accounts" has a default value of "false". This makes sure that when a regular user (of a "User" role) wants to share a template via GUI, he will not be shown the list of all accounts in his domain and he will need to know the name of the destination account with which he is sharing the template. This makes sense in public clouds where each account of a single domain is a different tenant/customer and privacy is imperative. In this case, the user will be presented with an input field to enter the account name, as on the images below:
+Global setting "allow.user.view.all.domain.accounts" has a default value of "false". This makes sure that when a regular user (of a "User" role) wants to share a template/ISO via GUI, he will not be shown the list of all accounts in his domain and he will need to know the name of the destination account with which he is sharing the template/ISO. This makes sense in public clouds where each account of a single domain is a different tenant/customer and privacy is imperative. In this case, the user will be presented with an input field to enter the account name, as on the images below:
+
+.. warning:: 
+      The images displayed below refer to template permissions, but the same applies for ISO permissions.
 
 |template-permissions-update-manually-1.PNG|
 
diff --git a/source/adminguide/troubleshooting.rst b/source/adminguide/troubleshooting.rst
index 667c727..e519257 100644
--- a/source/adminguide/troubleshooting.rst
+++ b/source/adminguide/troubleshooting.rst
@@ -130,7 +130,7 @@
 setup, see Creating a New Network Offering.
 
 For more information about the API syntax, see the API Reference at
-`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`_.
+`https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`_.
 
 
 Maintenance mode not working on vCenter
diff --git a/source/adminguide/ui.rst b/source/adminguide/ui.rst
index bc0cb5a..b47e53c 100644
--- a/source/adminguide/ui.rst
+++ b/source/adminguide/ui.rst
@@ -21,9 +21,14 @@
 CloudStack provides a web-based UI that can be used by both
 administrators and end users. The appropriate version of the UI is
 displayed depending on the credentials used to log in. The UI is
-available in popular browsers including IE7, IE8, IE9, Firefox 3.5+,
-Firefox 4, Safari 4, and Safari 5. The URL is: (substitute your own
-management server IP address)
+available in all modern popular browsers including Chrome, Firefox, Edge and
+Safari. The UI uses API auto-discovery to discover APIs allowed for a logged-in
+user and creates navigation and views based on that, and requires the following:
+
+- API discovery (listApis) enabled for all roles that must use the UI
+- Modern browsers that are `ES5-compliant <https://github.com/vuejs/vue#browser-compatibility>`_
+
+The URL is: (substitute your own management server IP address)
 
 .. parsed-literal::
 
@@ -65,6 +70,11 @@
 Root Administrator's UI Overview
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. image:: https://raw.githubusercontent.com/apache/cloudstack-primate/master/docs/screenshot-dashboard.png
+   :width: 800px
+   :alt: alternate text
+   :align: left
+
 The CloudStack UI helps the CloudStack administrator provision, view,
 and manage the cloud infrastructure, domains, user accounts, projects,
 and configuration settings. The first time you start the UI after a
@@ -168,94 +178,121 @@
 
 #. Type the new password, and click OK.
 
+Basic UI Customization
+~~~~~~~~~~~~~~~~~~~~~~
 
-Modifying the UI
-----------------
+Users can now customize the CloudStack's user interface by means of a configuration file at /usr/share/cloudstack-management/webapp/config.json which can be used to modify the theme, logos, etc. to align to one's requirement.
 
-Root Administrators can modify some aspect of the UI, like:
+To change the logo, login banner, error page icon, etc. the following details can be edited in config.json:
 
-   -  Changing the keyboard names/labels (in the "Add Instance" wizard only)
-   -  Changing the text and the title in the "About" dialog box
-   -  Changing the Help link
-   -  Changing the application title on the browser tab
-   -  Hiding some columns in the Instance Metrics and Volume Metrics tables/views
- 
-This can be done by editing the file "/usr/share/cloudstack-management/webapp/config.js" on your management server(s).
-After the file change, you do need to clear your browser cache. Hiding columns in Instance Metrics and Volume Metrics tables/views is only applicable to end users - i.e. those are always visible to Root Administrators.
+.. parsed-literal::
 
-This is the default config.js content (comments ommitted for brevity):
+    "logo": "assets/logo.svg",
+    "banner": "assets/banner.svg",
+    "error": {
+        "404": "assets/404.png",
+        "403": "assets/403.png",
+        "500": "assets/500.png"
+    }
 
-.. code:: javascript
+where,
 
-   cloudStackOptions = {
-      aboutText: "label.app.name", // This is the text shown in the 'About' box
-      aboutTitle: "label.about.app", // This is the Application 'Title' shown in the 'About' box
-      docTitle: "label.app.name", // This is the Application 'Title' shown on browser tab.
-      helpURL: "http://docs.cloudstack.apache.org/", // This is the URL that opens when users click Help
-      keyboardOptions: {
-         "us": "label.standard.us.keyboard",
-         "uk": "label.uk.keyboard",
-         "fr": "label.french.azerty.keyboard",
-         "jp": "label.japanese.keyboard",
-         "sc": "label.simplified.chinese.keyboard"
-      },
-      hiddenFields: { // Fields to be hidden only for users in the tables below
-         "metrics.instances": [], // Options - "name", "state", "ipaddress", "zonename", "cpuused", "memused", "network", "disk"
-         "metrics.volumes": [] // Options - "name", "state", "vmname", "sizegb", "physicalsize", "utilization", "storagetype", "storage"
-      }
-   };
+- logo: changes the logo top-left side image.
+- banner: changes the login banner image.
+- error.404: changes the image of error Page not found.
+- error.403: changes the image of error Forbidden.
+- error.500: changes the image of error Internal Server Error.
 
-Example of a changed config.js file is given bellow, as well as the apropriate screenshots which reflect (most of) those changes. Make sure that you are logged in as end user account.
+Customization of themes is also possible, such as, modifying banner width, general color, etc. This can be done by editing the "theme" section of the config.json file:
 
-.. code:: javascript
+.. parsed-literal::
 
-   cloudStackOptions = {
-      aboutText: "Custom About text!", // This is the text shown in the 'About' box
-      aboutTitle: "Custom About Title!", // This is the Application 'Title' shown in the 'About' box
-      docTitle: "MyCloud", // This is the Application 'Title' shown on browser tab.
-      helpURL: "http://help.mycloud.com/", // This is the URL that opens when users click Help
-      keyboardOptions: {
-         "us": "US",
-         "uk": "UK",
-         "fr": "FR",
-         "jp": "JP",
-         "sc": "CN"
-      },
-      hiddenFields: { // Fields to be hidden only for users in the tables below
-         "metrics.instances": ["zonename"], // Options - "name", "state", "ipaddress", "zonename", "cpuused", "memused", "network", "disk"
-         "metrics.volumes": ["utilization"] // Options - "name", "state", "vmname", "sizegb", "physicalsize", "utilization", "storagetype", "storage"
-      }
-   };
+    "theme": {
+        "@logo-background-color": "#ffffff",
+        "@project-nav-text-color": "#001529",
+        "@navigation-text-color": "rgba(255, 255, 255, 0.65)",
+        "@navigation-background-color": "#ffffff",
+        "@navigation-text-color": "rgba(0, 0, 0, 0.65)",
+        "@primary-color": "#1890ff",
+        "@link-color": "#1890ff",
+        "@link-hover-color": "#40a9ff",
+        "@loading-color": "#1890ff",
+        "@processing-color": "#1890ff",
+        "@success-color": "#52c41a",
+        "@warning-color": "#faad14",
+        "@error-color": "#f5222d",
+        "@font-size-base": "14px",
+        "@heading-color": "rgba(0, 0, 0, 0.85)",
+        "@text-color": "rgba(0, 0, 0, 0.65)",
+        "@text-color-secondary": "rgba(0, 0, 0, 0.45)",
+        "@disabled-color": "rgba(0, 0, 0, 0.25)",
+        "@border-color-base": "#d9d9d9",
+        "@border-radius-base": "4px",
+        "@box-shadow-base": "0 2px 8px rgba(0, 0, 0, 0.15)",
+        "@logo-width": "256px",
+        "@logo-height": "64px",
+        "@banner-width": "700px",
+        "@banner-height": "110px",
+        "@error-width": "256px",
+        "@error-height": "256px"
+    }
 
-|about-cloudstack-customized.JPG|
+where,
 
-Notice custom title and text
+- @logo-background-color changes the logo background color.
+- @project-nav-background-color changes the navigation menu background color of the project.
+- @project-nav-text-color changes the navigation menu background color of the project view.
+- @navigation-background-color changes the navigation menu background color.
+- @navigation-text-color changes the navigation text color.
+- @primary-color: changes the major background color of the page (background button, icon hover, etc).
+- @link-color changes the link color.
+- @link-hover-color changes the link hover color.
+- @loading-color changes the message loading color and page loading bar at the top page.
+- @success-color: changes success state color.
+- @processing-color: changes processing state color. Exp: progress status.
+- @warning-color: changes warning state color.
+- @error-color: changes error state color.
+- @heading-color: changes table header color.
+- @text-color: change in major text color.
+- @text-color-secondary: change of secondary text color (breadcrumb icon).
+- @disabled-color: disable state color (disabled button, switch, etc).
+- @border-color-base: change in major border color.
+- @logo-width: change the width of the logo top-left side.
+- @logo-height: change the height of the logo top-left side.
+- @banner-width: changes the width of the login banner.
+- @banner-height: changes the height of the login banner.
+- @error-width: changes the width of the error image.
+- @error-height: changes the height of the error image.
 
+Some assorted primary theme colours:
 
-|add-instance-keyboards-customized.JPG|
+- Blue: #1890FF
+- Red: #F5222D
+- Yellow: #FAAD14
+- Cyan: #13C2C2
+- Green: #52C41A
+- Purple: #722ED1
 
-Notice short keyboard names (based on country code)
+Advanced Customisation
+~~~~~~~~~~~~~~~~~~~~~~
 
+The advanced UI customisation is possible only by changing JavaScript based config
+files which define rules for sections, names, icons, actions and components and by
+building the UI from the source available on `github.com/apache/cloudstack
+<https://github.com/apache/cloudstack>`_ repository. Advanced customisation may
+require some experience in JavaScript and VueJS, a development and customisation
+guide in the source repository.
 
-|instance-metrics-customized-view.JPG|
+Known Limitations
+~~~~~~~~~~~~~~~~~
 
-Notice "Zone" column is hidden
+The following features are no longer supported or available:
 
-
-|volume-metrics-customized-view.JPG|
-
-Notice "Utilisation" column is hidden
-
-
-
+- Deployment of a basic zone is not supported. However, existing basic zones will continue to be supported as well as all the actions and views of various resources within the existing basic zone.
+- Support for S3 based secondary storage.
+- NFS secondary staging storage list/resource view and add/update actions.
+- SSL certificate for Guest network LB rule.
+- Regions.
 
 .. |change-password.png| image:: /_static/images/change-password.png
    :alt: button to change a user's password
-.. |volume-metrics-customized-view.JPG| image:: /_static/images/volume-metrics-customized-view.JPG
-   :alt: Notice missing "Utilisation" column
-.. |instance-metrics-customized-view.JPG| image:: /_static/images/instance-metrics-customized-view.JPG
-   :alt: Notice missing "Zone" column
-.. |about-cloudstack-customized.JPG| image:: /_static/images/about-cloudstack-customized.JPG
-   :alt: Notice custom title and text   
-.. |add-instance-keyboards-customized.JPG| image:: /_static/images/add-instance-keyboards-customized.JPG
-   :alt: Notice short keyboard names (based on country code)   
diff --git a/source/adminguide/virtual_machines.rst b/source/adminguide/virtual_machines.rst
index 4c2e907..a02645b 100644
--- a/source/adminguide/virtual_machines.rst
+++ b/source/adminguide/virtual_machines.rst
@@ -141,9 +141,10 @@
    service offering.
 
    .. note:: 
-      VMware only: If the selected template OVF contains static properties, the wizard will display these properties. Static 
-      properties do not have the concept of required and optional fields . Therefore CloudStack is not able
-      to enforce the population of 'important fields'.
+      VMware only: If the selected template contains OVF properties, different deployment options or configurations,
+      multiple NICs or end-user license agreements, then the wizard will display these properties.
+
+      See `“Support for Virtual Appliances” <virtual_machines.html#support-for-virtual-appliances>`_.
 
 #. Click Submit and your VM will be created and started.
 
@@ -752,6 +753,9 @@
 The Settings tab is always present/visible, but settings can be changed only when the VM is in a Stopped state. 
 Some VM details/settings can be hidden via "user.vm.blacklisted.details" global setting (you can find below the list of those hidden by default).
 
+.. note::
+   Since version 4.15, VMware VM settings for the ROOT disk controller, NIC adapter type and data disk controller are populated automatically with the values inherited from the template.
+
 When adding a new setting or modifying the existing ones, setting names are shown/offered in a drop-down list, as well as their possible values (with the exception of boolean or numerical values).
 
 Read-only details/settings that are hidden by default:
@@ -913,6 +917,16 @@
    VM snapshots are deleted automatically when a VM is destroyed. You don't 
    have to manually delete the snapshots in this case.
 
+Support for Virtual Appliances
+==============================
+
+.. include:: virtual_machines/virtual_appliances.rst
+
+Unmanaging Virtual Machines
+===========================
+
+.. include:: virtual_machines/unmanage_vms.rst
+
 
 Importing Virtual Machines
 ===========================
diff --git a/source/adminguide/virtual_machines/VM_Ingestion.rst b/source/adminguide/virtual_machines/VM_Ingestion.rst
index 54bf18b..a1eda3e 100644
--- a/source/adminguide/virtual_machines/VM_Ingestion.rst
+++ b/source/adminguide/virtual_machines/VM_Ingestion.rst
@@ -13,22 +13,6 @@
    specific language governing permissions and limitations
    under the License.
 
-About Importing VMs
---------------------
-
-Unmanaged Virtual Machines
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-As of ACS 4.14, CloudStack has the concept of **unmanaged** virtual machines.  These are virtual machines that are on CloudStack
-managed hosts, but that are not in CloudStack's database and therefore CloudStack cannot control (manage) then in any way.  Previously,
-such VMs could exist, but CloudStack did not 'see' them (their existence *would* be reported in logs as unrecognised VMs).
-
-From ACS 4.14 onwards, CloudStack is able to list these VMs via the listUnmanagedInstances API command and then import (also known as ingest)
-those unmanaged VMs via the importUnmanagedInstance API so that they become CloudStack managed guest instances
-
-.. note:: This is currently only available for **vSphere** clusters.
-
-
 Use Cases and General Usage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -123,12 +107,14 @@
    - **projectid**
    - **templateid**
    - **serviceofferingid**
-   - **diskofferingid** (UUID of disk offering for root disk)
    - **nicnetworklist** (Map for NIC ID and corresponding Network UUID)
    - **nicipaddresslist** (Map for NIC ID and corresponding IP address)
    - **datadiskofferinglist** (Map for data disk ID and corresponding disk offering UUID)
    - **details** (Map for VM details)
    - **migrateallowed** (VM and its volumes are allowed to migrate to different host/storage pool when offering tags conflict with host/storage pool)
+   - **forced** (If true, a VM is imported despite some of its NIC's MAC addresses being already present)
+
+.. note:: The `forced` parameter is false by default and prevents importing a VM which has a NIC containing a MAC address that has been previously assigned by CloudStack. If it is set to true, the NICs with MAC addresses which already exist in the CloudStack database have the existing MAC addresses reassigned to its NICs.
 
 **Response**:
 
diff --git a/source/adminguide/virtual_machines/unmanage_vms.rst b/source/adminguide/virtual_machines/unmanage_vms.rst
new file mode 100644
index 0000000..9cf2c36
--- /dev/null
+++ b/source/adminguide/virtual_machines/unmanage_vms.rst
@@ -0,0 +1,82 @@
+About Unmanaged Virtual Machines
+--------------------------------
+
+As of ACS 4.14, CloudStack has the concept of **unmanaged** virtual machines.  These are virtual machines that are on CloudStack
+managed hosts, but that are not in CloudStack's database and therefore CloudStack cannot control (manage) then in any way.  Previously,
+such VMs could exist, but CloudStack did not 'see' them (their existence *would* be reported in logs as unrecognised VMs).
+
+From ACS 4.14 onwards, CloudStack is able to list these VMs via the listUnmanagedInstances API command and then import (also known as ingest)
+those unmanaged VMs via the importUnmanagedInstance API so that they become CloudStack managed guest instances
+
+From ACS 4.15 onwards, administrators are able to unmanage guest virtual machines.
+
+.. note:: This is currently only available for **vSphere** clusters.
+
+Unmanaging Virtual Machines via API
+-----------------------------------
+
+Administrators are able to unmanage guest virtual machines from CloudStack. Once unmanaged, CloudStack can no longer monitor, control or administer the provisioning and orchestration related operations on a virtual machine.
+
+To unmanage a guest virtual machine, an administrator must invoke the unmanageVirtualMachine API passing the ID of the virtual machine to unmanage. The API has the following preconditions:
+
+- The virtual machine must not be destroyed
+- The virtual machine state must be 'Running’ or ‘Stopped’
+- The virtual machine must be a VMware virtual machine
+
+The API execution will perform the following pre-checks, failing if they are not met:
+
+- There are no volume snapshots associated with any of the virtual machine volumes
+- There is no ISO attached to the virtual machine
+
+.. note:: This is currently only available for **vSphere** clusters.
+
+
+Preserving unmanaged virtual machine NICs
+-----------------------------------------
+
+The zone setting: unmanage.vm.preserve.nics can be used to preserve virtual machine NICs and its MAC addresses after unmanaging them. If set to true, the virtual machine NICs (and their MAC addresses) are preserved when unmanaging it. Otherwise, NICs are removed and MAC addresses can be reassigned.
+
+
+Unmanaging virtual machine actions
+----------------------------------
+
+- Clean up virtual machine NICs and deallocate network resources used such as IP addresses and DHCP entries on virtual routers.
+
+   - If ‘unmanage.vm.preserve.nics’ = ‘false’ then the NICs are deallocated and removed from CloudStack
+
+   - If ‘unmanage.vm.preserve.nics’ = ‘true’ then the NICs remain allocated and are not removed from the database. The NIC’s MAC addresses remain preserved and therefore cannot be assigned to any new NIC.
+
+- Clean up virtual machine volumes in the CloudStack database
+
+- Clean up virtual machine snapshots in the CloudStack database (if any)
+- Revoke host access to any managed volumes attached to the VM (applicable to managed storage only)
+
+- Clean up the virtual machine from the following:
+
+   - Remove the virtual machine from security groups (if any)
+
+   - Remove the virtual machine from instance groups (if any)
+
+   - Remove firewall rules for the virtual machine (if any)
+
+   - Remove port forwarding rules for the virtual machine (if any)
+
+   - Remove load balancing rules for the virtual machine (if any)
+
+   - Disable static NAT (if the virtual machine is assigned to it)
+
+   - Remove the virtual machine from affinity groups (if any)
+
+- Remove VM details from the CloudStack database
+
+- Decrement the account resources count for volumes and virtual machines
+
+- Generate usage events:
+
+   - For volumes destroyed, with type: ‘VOLUME.DELETE’
+
+   - For virtual machine snapshots destroyed (if any), with type: ‘VMSNAPSHOT.DELETE’ and 'VMSNAPSHOT.OFF_PRIMARY'
+   
+   - For virtual machine NICs destroyed: with type: ‘NETWORK.OFFERING.REMOVE’
+   
+   - For the virtual machine being unmanaged: stopped and destroyed usage events (similar to the generated usage events when expunging a virtual machine), with types: ‘VM.STOP’ and ‘VM.DESTROY', unless the VM has been already stopped before being unmanaged and in this case only ‘VM.DESTROY' is generated.
diff --git a/source/adminguide/virtual_machines/user-data.rst b/source/adminguide/virtual_machines/user-data.rst
index c5db9e1..4f5208e 100644
--- a/source/adminguide/virtual_machines/user-data.rst
+++ b/source/adminguide/virtual_machines/user-data.rst
@@ -17,35 +17,39 @@
 User-Data and Meta-Data
 -----------------------
 
-CloudStack provides API access to attach up to 2KB of data after base64 encoding
-to a deployed VM. Using HTTP POST(via POST body), you can send up to 32K of data
-after base64 encoding. Deployed VMs also have access to instance metadata via
-the virtual router.
+CloudStack provides APIs to attach up to 32KB of user-data to a deployed VM.
 
-Create virtual machine thru the API: `deployVirtualMachine <http://cloudstack.apache.org/docs/api/apidocs-4.5/user/deployVirtualMachine.html>`_
-using the parameter ``userdata=`` to include user-data formated in
-`base64 <https://www.base64encode.org/>`_.
+There are two CloudStack APIs that can be used to store user-data:
+`deployVirtualMachine <https://cloudstack.apache.org/docs/api/apidocs-4.14/user/deployVirtualMachine.html>`_
+and
+`updateVirtualMachine <https://cloudstack.apache.org/docs/api/apidocs-4.14/user/updateVirtualMachine.html>`_
+They both support the parameter ``userdata=``. The value for this parameter
+must be a `base64 <https://www.base64encode.org/>`_-encoded multi-part MIME
+message. See further below for an example of what this should look like.
 
-Accessed user-data from VM. Once the IP address of the virtual router is
-known, use the following steps to retrieve user-data:
+HTTP GET parameters are limited to a length of 2048 bytes, but it is possible
+to store larger user-data blobs by sending them in the body via HTTP POST
+instead of GET.
 
-#. Run the following command to find the virtual router.
+From inside the VM, the user-data is accessible via the virtual router,
+if the UserData service is enabled on the network offering.
 
-   .. code:: bash
+If you are using the DNS service of the virtual router, a special hostname
+called `data-server.` is provided, that will point to a valid user-data server.
 
-      # cat /var/lib/dhclient/dhclient-eth0.leases | grep dhcp-server-identifier | tail -1
+Otherwise you have to determine the virtual router address via other means,
+such as DHCP leases. Be careful to scan all routers if you have multiple
+networks attached to a VM, in case not all of them have the UserData service
+enabled.
 
-#. Access user-data by running the following command using the result of
-   the above command
+User-data is available from the URL ``http://data-server./latest/user-data``
+and can be fetched via curl or other HTTP client.
 
-   .. code:: bash
+It is also possible to fetch VM metadata from the same service, via the URL
+``http://data-server./latest/{metadata type}``.  For backwards compatibility,
+the previous URL ``http://data-server./latest/{metadata type}`` is also supported.
 
-      # curl http://10.1.1.1/latest/user-data
-
-Meta Data can be accessed similarly, using a URL of the form
-``http://10.1.1.1/latest/meta-data/{metadata type}``. (For backwards
-compatibility, the previous URL ``http://10.1.1.1/latest/{metadata type}``
-is also supported.) For metadata type, use one of the following:
+For metadata type, use one of the following:
 
 -  ``service-offering``. A description of the VMs service offering
 
@@ -55,23 +59,53 @@
 
 -  ``local-hostname``. The hostname of the VM
 
--  ``public-ipv4``. The first public IP for the router. (E.g. the first IP
-   of eth2)
+-  ``public-ipv4``. The first public IP for the router.
 
 -  ``public-hostname``. This is the same as public-ipv4
 
 -  ``instance-id``. The instance name of the VM
 
 
-Using Cloud-Init
+Determining the virtual router address without DNS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If can't or don't want to use the virtual router's DNS service, it's also
+possible to determine the user-data server from a DHCP lease.
+
+#. Run the following command to find the virtual router.
+
+   .. code:: bash
+
+      # cat /var/lib/dhcp/dhclient.eth0.leases | grep dhcp-server-identifier | tail -1
+
+#. Access the data-server via its IP
+
+   .. code:: bash
+
+      # curl http://10.1.1.1/latest/user-data
+
+
+Fetching user-data via the API
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+User-data is not included with the normal VM state for historic reasons.
+To read out the base64-encoded user-data via the API, use the `getVirtualMachineUserData <https://cloudstack.apache.org/docs/api/apidocs-4.14/user/getVirtualMachineUserData.html>`_
+API call:
+
+.. code:: bash
+
+   cmk get virtualmachineuserdata virtualmachineid=8fd996b6-a102-11ea-ba47-23394b299ae9
+
+
+Using cloud-init
 ~~~~~~~~~~~~~~~~
 
-`Cloud-Init <https://cloudinit.readthedocs.org/en/latest>`_ can be use to access
-an interpret user-data from virtual machines. Cloud-Init be installed into 
-templates and also require CloudStack password and sshkey scripts (:ref:`adding-password-management-to-templates` and `using ssh keys <virtual_machines.html#using-ssh-keys-for-authentication>`_). User password management and 
-``resetSSHKeyForVirtualMachine`` API are not yet supported by cloud-init.
+`cloud-init <https://cloudinit.readthedocs.org/en/latest>`_ can be used to access
+and interpret user-data inside virtual machines. If you install cloud-init into your
+VM templates, it will allow you to store SSH keys and user passwords on each new
+VM deployment automatically (:ref:`adding-password-management-to-templates` and `using ssh keys <virtual_machines.html#using-ssh-keys-for-authentication>`_).
 
-#. Install cloud-init package into a template:
+#. Install cloud-init package into a VM template:
 
    .. code:: bash
 
@@ -79,7 +113,7 @@
         or
       $ sudo apt-get install cloud-init
 
-#. Create datasource configuration file: ``/etc/cloud/cloud.cfg.d/99_cloudstack.cfg``
+#. Create a datasource configuration file in the VM template: ``/etc/cloud/cloud.cfg.d/99_cloudstack.cfg``
 
    .. code:: yaml
 
@@ -90,13 +124,25 @@
         - CloudStack
 
 
-user-data example
-~~~~~~~~~~~~~~~~~
+Custom user-data example
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-This example use cloud-init to Upgrade Operating-System of the newly created VM:
+This example uses cloud-init to automatically update all OS packages on the first launch.
 
-.. code:: yaml 
+#. Create user-data, wrapped into a multi-part MIME message and encoded in base64:
 
+.. code:: bash
+
+   base64 <<EOF
+   Content-Type: multipart/mixed; boundary="//"
+   MIME-Version: 1.0
+   
+   --//
+   Content-Type: text/cloud-config; charset="us-ascii"
+   MIME-Version: 1.0
+   Content-Transfer-Encoding: 7bit
+   Content-Disposition: attachment; filename="cloud-config.txt"
+   
    #cloud-config
    
    # Upgrade the instance on first boot
@@ -105,15 +151,18 @@
    # Default: false
    # Aliases: apt_upgrade
    package_upgrade: true
-
-
-base64 formated:
+   EOF
+   
+#. Deploy a VM with this user-data:
 
 .. code:: bash
 
-   I2Nsb3VkLWNvbmZpZw0KDQojIFVwZ3JhZGUgdGhlIGluc3RhbmNlIG9uIGZpcnN0IGJvb3QNCiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpDQojDQojIERlZmF1bHQ6IGZhbHNlDQojIEFsaWFzZXM6IGFwdF91cGdyYWRlDQpwYWNrYWdlX3VwZ3JhZGU6IHRydWUNCg==
+   cmk deploy virtualmachine name=..... userdata=Q29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5PSIvLyIKTUlNRS1WZXJzaW9uOiAxLjAKCi0tLy8KQ29udGVudC1UeXBlOiB0ZXh0L2Nsb3VkLWNvbmZpZzsgY2hhcnNldD0idXMtYXNjaWkiCk1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDdiaXQKQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudDsgZmlsZW5hbWU9ImNsb3VkLWNvbmZpZy50eHQiCgojY2xvdWQtY29uZmlnCgojIFVwZ3JhZGUgdGhlIGluc3RhbmNlIG9uIGZpcnN0IGJvb3QKIyAoaWUgcnVuIGFwdC1nZXQgdXBncmFkZSkKIwojIERlZmF1bHQ6IGZhbHNlCiMgQWxpYXNlczogYXB0X3VwZ3JhZGUKcGFja2FnZV91cGdyYWRlOiB0cnVlCg==
 
-Refer to `Cloud-Init CloudStack datasource <http://cloudinit.readthedocs.org/en/latest/topics/datasources.html#cloudstack>`_
-documentation for latest capabilities. Cloud-Init and Cloud-Init CloudStack
+
+Disclaimer
+~~~~~~~~~~
+
+Refer to the `cloud-init CloudStack datasource <http://cloudinit.readthedocs.org/en/latest/topics/datasources.html#cloudstack>`_
+documentation for latest capabilities. cloud-init and the cloud-init CloudStack
 datasource are not supported by Apache CloudStack community.
-
diff --git a/source/adminguide/virtual_machines/virtual_appliances.rst b/source/adminguide/virtual_machines/virtual_appliances.rst
new file mode 100644
index 0000000..e14d759
--- /dev/null
+++ b/source/adminguide/virtual_machines/virtual_appliances.rst
@@ -0,0 +1,65 @@
+About Virtual Appliances
+------------------------
+
+CloudStack allows users to deploy virtual appliances on VMware such as its been made directly though vCenter.
+Vendors of virtual appliances for VMware often produce ‘templates’ of their appliances in an OVA format.
+An OVA file contain disc images, as well as the configuration data of the virtual appliance and also at times a EULA which must be acknowledged.
+
+Virtual Appliances are supported only on VMware.
+
+.. note::
+    Since version 4.15, all the new templates registered are treated as virtual appliance templates.
+
+    To keep the existing functionality, all the templates registered before version 4.15 are not affected by this changes.
+
+Deployment options (configurations)
+-----------------------------------
+
+VMware templates can provide different deployment options in their OVF descriptor file. CloudStack obtains
+the different deployment options when the template is registered and it displays them to the users
+in the virtual machine deployment wizard, under the 'Compute Offering' section.
+
+After the user selects a deployment option, CloudStack lists the compute offerings which match or exceed the
+deployment options hardware requirements for CPU and memory.
+
+.. note::
+    All the custom unconstrained compute offerings are displayed, but only those constrained custom offerings
+    in which the maximum or minimum requirements for CPU and memory are supported by the selected deployment option.
+
+.. |vapps-deployment-opts.png| image:: /_static/images/vapps-deployment-opts.png
+.. |vapps-eulas.png| image:: /_static/images/vapps-eulas.png
+.. |vapps-networks.png| image:: /_static/images/vapps-networks.png
+.. |vapps-properties.png| image:: /_static/images/vapps-properties.png
+
+The 'Compute Offering' section will be similar to this:
+      |vapps-deployment-opts.png|
+
+
+Network interfaces
+------------------
+
+In case the template requires the virtual appliance to connect different network interfaces, these are displayed in the 'Networks' section, similar to this:
+
+|vapps-networks.png|
+
+
+Properties
+----------
+
+If the template contains properties that require the user input, those are being displayed on the 'Properties' section, similar to this:
+
+|vapps-properties.png|
+
+
+End-user license agreements
+---------------------------
+
+If the template contains one or more end-user license agreements, the user must accept them prior to deploy their virtual appliance.
+If the license agreements are not accepted, then it is not possible to deploy a virtual appliance.
+
+|vapps-eulas.png|
+
+Advanced deployment settings
+----------------------------
+
+It is not possible to choose the boot type (BIOS, UEFI) and boot mode for virtual appliances. The boot mode and type used by the virtual appliances is defined in the template. 
\ No newline at end of file
diff --git a/source/conceptsandterminology/locale/pot/dev.pot b/source/conceptsandterminology/locale/pot/dev.pot
index e97c9d1..da7742a 100644
--- a/source/conceptsandterminology/locale/pot/dev.pot
+++ b/source/conceptsandterminology/locale/pot/dev.pot
@@ -103,7 +103,7 @@
 
 #: ../../dev.rst:64
 # bcdf9d282f994c9e9cfc62a64151533a
-msgid "`http://cloudstack.apache.org/docs/api/ <http://cloudstack.apache.org/docs/api/>`__"
+msgid "`https://cloudstack.apache.org/api.html <https://cloudstack.apache.org/api.html>`__"
 msgstr ""
 
 #: ../../dev.rst:68
diff --git a/source/conceptsandterminology/locale/pot/developer_guide.pot b/source/conceptsandterminology/locale/pot/developer_guide.pot
index 2e6995b..0c8252b 100644
--- a/source/conceptsandterminology/locale/pot/developer_guide.pot
+++ b/source/conceptsandterminology/locale/pot/developer_guide.pot
@@ -443,12 +443,12 @@
 
 #: ../../developer_guide.rst:460
 # 7c104d4cd0fe475e863b91f53449a5c5
-msgid "The CloudStack API is a query based API using http that return results in XML or JSON. It is used to implement the default web UI. This API is not a standard like `OGF OCCI <http://www.ogf.org/gf/group_info/view.php?group=occi-wg>`__ or `DMTF CIMI <http://dmtf.org/standards/cloud>`__ but is easy to learn. Mapping exists between the AWS API and the CloudStack API as will be seen in the next section. Recently a Google Compute Engine interface was also developed that maps the GCE REST API to the CloudStack API described here. The API `docs <http://cloudstack.apache.org/docs/api/>`__ are a good start to learn the extent of the API. Multiple clients exist on `github <https://github.com/search?q=cloudstack+client&ref=cmdform>`__ to use this API, you should be able to find one in your favorite language. The reference documentation for the API and changes that might occur from version to version is availble `on-line <http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.1.1/html/Developers_Guide/index.html>`__. This short section is aimed at providing a quick summary to give you a base understanding of how to use this API. As a quick start, a good way to explore the API is to navigate the dashboard with a firebug console (or similar developer console) to study the queries."
+msgid "The CloudStack API is a query based API using http that return results in XML or JSON. It is used to implement the default web UI. This API is not a standard like `OGF OCCI <http://www.ogf.org/gf/group_info/view.php?group=occi-wg>`__ or `DMTF CIMI <http://dmtf.org/standards/cloud>`__ but is easy to learn. Mapping exists between the AWS API and the CloudStack API as will be seen in the next section. Recently a Google Compute Engine interface was also developed that maps the GCE REST API to the CloudStack API described here. The API `docs <https://cloudstack.apache.org/api.html>`__ are a good start to learn the extent of the API. Multiple clients exist on `github <https://github.com/search?q=cloudstack+client&ref=cmdform>`__ to use this API, you should be able to find one in your favorite language. The reference documentation for the API and changes that might occur from version to version is availble `on-line <http://cloudstack.apache.org/docs/en-US/Apache_CloudStack/4.1.1/html/Developers_Guide/index.html>`__. This short section is aimed at providing a quick summary to give you a base understanding of how to use this API. As a quick start, a good way to explore the API is to navigate the dashboard with a firebug console (or similar developer console) to study the queries."
 msgstr ""
 
 #: ../../developer_guide.rst:481
 # 0bcb8dd851254f9b9b0240917b405d84
-msgid "In a succint statement, the CloudStack query API can be used via http GET requests made against your cloud endpoint (e.g http://localhost:8080/client/api). The API name is passed using the ``command`` key and the various parameters for this API call are passed as key value pairs. The request is signed using the access key and secret key of the user making the call. Some calls are synchronous while some are asynchronous, this is documented in the API `docs <http://cloudstack.apache.org/docs/api/>`__. Asynchronous calls return a ``jobid``, the status and result of a job can be queried with the ``queryAsyncJobResult`` call. Let's get started and give an example of calling the ``listUsers`` API in Python."
+msgid "In a succint statement, the CloudStack query API can be used via http GET requests made against your cloud endpoint (e.g http://localhost:8080/client/api). The API name is passed using the ``command`` key and the various parameters for this API call are passed as key value pairs. The request is signed using the access key and secret key of the user making the call. Some calls are synchronous while some are asynchronous, this is documented in the API `docs <https://cloudstack.apache.org/api.html>`__. Asynchronous calls return a ``jobid``, the status and result of a job can be queried with the ``queryAsyncJobResult`` call. Let's get started and give an example of calling the ``listUsers`` API in Python."
 msgstr ""
 
 #: ../../developer_guide.rst:493
diff --git a/source/conceptsandterminology/network_setup.rst b/source/conceptsandterminology/network_setup.rst
index 118ce35..e78a450 100644
--- a/source/conceptsandterminology/network_setup.rst
+++ b/source/conceptsandterminology/network_setup.rst
@@ -1003,7 +1003,7 @@
    Traffic Sentinel as protocol + host + port (optional); for example,
    http://10.147.28.100:8080. For the addTrafficMonitor command syntax,
    see the API Reference at `API Documentation 
-   <http://cloudstack.apache.org/docs/api/index.html>`_.
+   <https://cloudstack.apache.org/api.html>`_.
 
    For information about how to call the CloudStack API, see the
    Developer’s Guide at the CloudStack API Developer's Guide :ref:`the-api`
diff --git a/source/conf.py b/source/conf.py
index 9733e62..06b219b 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -20,13 +20,13 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Apache CloudStack'
-copyright = '2012-2020, Apache Foundation'
+copyright = '2012-2021, Apache Foundation'
 author = 'Apache CloudStack Project'
 
 # The short X.Y version
-version = '4.14'
+version = '4.15'
 # The full version, including alpha/beta/rc tags
-release = '4.14.0.0'
+release = '4.15.0.0'
 
 rst_epilog = """
 .. include:: /_global.rst 
diff --git a/source/developersguide/dev.rst b/source/developersguide/dev.rst
index 9aa69ad..8733e08 100644
--- a/source/developersguide/dev.rst
+++ b/source/developersguide/dev.rst
@@ -64,8 +64,8 @@
 
 You can find all the API reference documentation at the below site:
 
-`http://cloudstack.apache.org/docs/api/ 
-<http://cloudstack.apache.org/docs/api/>`__
+`https://cloudstack.apache.org/api.html 
+<https://cloudstack.apache.org/api.html>`__
 
 
 Making API Requests
diff --git a/source/developersguide/developer_guide.rst b/source/developersguide/developer_guide.rst
index 01aa636..4add3fb 100644
--- a/source/developersguide/developer_guide.rst
+++ b/source/developersguide/developer_guide.rst
@@ -346,7 +346,7 @@
 seen in the next section. Recently a Google Compute Engine interface was
 also developed that maps the GCE REST API to the CloudStack API
 described here. The API
-`docs <http://cloudstack.apache.org/docs/api/>`__ are a good start to
+`docs <https://cloudstack.apache.org/api.html>`__ are a good start to
 learn the extent of the API. Multiple clients exist on
 `github <https://github.com/search?q=cloudstack+client&ref=cmdform>`__
 to use this API, you should be able to find one in your favorite
@@ -365,7 +365,7 @@
 as key value pairs. The request is signed using the access key and
 secret key of the user making the call. Some calls are synchronous while
 some are asynchronous, this is documented in the API
-`docs <http://cloudstack.apache.org/docs/api/>`__. Asynchronous calls
+`docs <https://cloudstack.apache.org/api.html>`__. Asynchronous calls
 return a ``jobid``, the status and result of a job can be queried with
 the ``queryAsyncJobResult`` call. Let's get started and give an example
 of calling the ``listUsers`` API in Python.
diff --git a/source/installguide/building_from_source.rst b/source/installguide/building_from_source.rst
index 6b5d358..21000e6 100644
--- a/source/installguide/building_from_source.rst
+++ b/source/installguide/building_from_source.rst
@@ -18,52 +18,56 @@
 ------------
 
 The official CloudStack release is always in source code form. You will
-likely be able to find "convenience binaries," the source is the
-canonical release. In this section, we'll cover acquiring the source
-release and building that so that you can deploy it using Maven or
-create Debian packages or RPMs.
+likely be able to find "convenience binaries", where the source is the
+canonical release. In this section, we will cover acquiring and building
+the source release so that you can deploy using Maven or
+build packages for distribution (e.g. ``.deb``, ``.rpm``).
 
-Note that building and deploying directly from source is typically not
-the most efficient way to deploy an IaaS. However, we will cover that
-method as well as building RPMs or Debian packages for deploying
-CloudStack.
+.. note::
 
-The instructions here are likely version-specific. That is, the method
-for building from source for the 4.7.x series is different from the
-4.2.x series.
+   Building and deploying directly from source is typically not
+   the most efficient way to deploy CloudStack. Also, please be aware that
+   development branches may contain unstable code. If you run into any issues
+   during the build process, please check the CloudStack `Issues
+   <https://github.com/apache/cloudstack/issues>`_ page on GitHub. You may find
+   that the issue you are experiencing has already been reported.
 
-If you are working with a unreleased version of CloudStack, see the
-INSTALL.md file in the top-level directory of the release.
+The instructions here are likely version-specific (i.e. Building 4.7.x
+is different from building 4.2.x).
+
+If you are working with an unreleased version of CloudStack, please read the
+``INSTALL.md`` file in the top-level directory of the release.
 
 
-Downloading the release
+Downloading the Release
 -----------------------
 
 You can download the latest CloudStack release from the `Apache
-CloudStack project download page 
+CloudStack project download page
 <http://cloudstack.apache.org/downloads.html>`_.
 
-Prior releases are available via archive.apache.org as well. See the
-downloads page for more information on archived releases.
+Prior releases are available via `archive.apache.org
+<https://archive.apache.org>`_ as well. Please see the
+Downloads page for more information on archived releases.
 
-You'll notice several links under the 'Latest release' section. A link
-to a file ending in ``tar.bz2``, as well as a PGP/GPG signature, MD5,
+You will notice several links under the *Latest CloudStack Releases* section.
+A link to a file ending in ``tar.bz2``, as well as a PGP/GPG signature, MD5,
 and SHA512 file.
 
--  The ``tar.bz2`` file contains the Bzip2-compressed tarball with the
+-  The ``tar.bz2`` file contains the bzip2-compressed tarball with the
    source code.
 
 -  The ``.asc`` file is a detached cryptographic signature that can be
-   used to help verify the authenticity of the release.
+   used to verify release authenticity.
 
--  The ``.md5`` file is an MD5 hash of the release to aid in verify the
-   validity of the release download.
+-  The ``.md5`` file is a MD5 hash that can be used to verify release
+   authenticity.
 
--  The ``.sha`` file is a SHA512 hash of the release to aid in verify
-   the validity of the release download.
+-  The ``.sha`` file is a SHA512 hash that can be used to verify release
+   authenticity.
 
 
-Verifying the downloaded release
+Verifying the Downloaded Release
 --------------------------------
 
 There are a number of mechanisms to check the authenticity and validity
@@ -202,7 +206,7 @@
 .. parsed-literal::
 
    sudo apt-get update
-   sudo apt-get install mysql-connector-python   
+   sudo apt-get install mysql-connector-python
 
 .. note::
 
@@ -250,7 +254,7 @@
    $ sudo apt-get install python-software-properties
    $ sudo apt-get update
    $ sudo apt-get install debhelper openjdk-11-jdk libws-commons-util-java genisoimage libcommons-codec-java libcommons-httpclient-java liblog4j1.2-java maven
-   
+
 .. note::
 
    If on Ubuntu 18.04, in above command, please replace "python-software-properties" with "software-properties-common"
@@ -397,10 +401,10 @@
 Building RPMs from Source
 -------------------------
 
-As mentioned previously in `“Prerequisites for building Apache CloudStack” 
-<#prerequisites-for-building-apache-cloudstack>`_, you will need to install 
+As mentioned previously in `“Prerequisites for building Apache CloudStack”
+<#prerequisites-for-building-apache-cloudstack>`_, you will need to install
 several prerequisites before you can build packages for CloudStack. Here we'll
-assume you're working with a 64-bit build of CentOS or Red Hat Enterprise 
+assume you're working with a 64-bit build of CentOS or Red Hat Enterprise
 Linux.
 
 .. parsed-literal::
@@ -449,16 +453,16 @@
 
 .. note::
 
-   Packaging has changed. If you've created packages for CloudStack 
-   previously, you should be aware that the process has changed considerably 
-   since the project has moved to using Apache Maven. Please be sure to follow 
+   Packaging has changed. If you've created packages for CloudStack
+   previously, you should be aware that the process has changed considerably
+   since the project has moved to using Apache Maven. Please be sure to follow
    the steps in this section closely.
 
 
 Generating RPMS
 ~~~~~~~~~~~~~~~
 
-Now that we have the prerequisites and source, you will cd to the 
+Now that we have the prerequisites and source, you will cd to the
 `packaging/` directory.
 
 .. parsed-literal::
@@ -470,7 +474,7 @@
 .. parsed-literal::
 
    $ ./package.sh -d centos63
-   
+
 For other supported options(like centos7), run ``./package.sh --help``
 
 That will run for a bit and then place the finished packages in
@@ -537,11 +541,11 @@
 
 .. warning::
 
-   Some of the plugins supported by CloudStack cannot be distributed with 
-   CloudStack for licensing reasons. In some cases, some of the required 
-   libraries/JARs are under a proprietary license. In other cases, the 
-   required libraries may be under a license that's not compatible with 
-   `Apache's licensing guidelines for third-party products 
+   Some of the plugins supported by CloudStack cannot be distributed with
+   CloudStack for licensing reasons. In some cases, some of the required
+   libraries/JARs are under a proprietary license. In other cases, the
+   required libraries may be under a license that's not compatible with
+   `Apache's licensing guidelines for third-party products
    <http://www.apache.org/legal/resolved.html#category-x>`_.
 
 #. To build the Non-OSS plugins, you'll need to have the requisite JARs
@@ -549,7 +553,7 @@
 
    Because these modules require dependencies that can't be distributed
    with CloudStack you'll need to download them yourself. Links to the
-   most recent dependencies are listed on the `*How to build CloudStack* 
+   most recent dependencies are listed on the `*How to build CloudStack*
    <https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack>`_
    page on the wiki.
 
@@ -567,6 +571,5 @@
    $ mvn install -Dnoredist
 
 #. Once you've built CloudStack with the ``noredist`` profile, you can
-   package it using the `“Building RPMs from Source” <#building-rpms-from-source>`_ 
+   package it using the `“Building RPMs from Source” <#building-rpms-from-source>`_
    or `“Building DEB packages” <#building-deb-packages>`_ instructions.
-
diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst
index 86cff2a..89123c3 100644
--- a/source/installguide/configuration.rst
+++ b/source/installguide/configuration.rst
@@ -1182,27 +1182,39 @@
 
    -  **Protocol.** For XenServer, choose either NFS, iSCSI, or
       PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere
-      choose either VMFS (iSCSI or FiberChannel) or NFS. For Hyper-V,
+      choose either NFS, PreSetup (VMFS, vSAN, vVols) or datastorecluster. For Hyper-V,
       choose SMB.
 
    -  **Server (for NFS, iSCSI, or PreSetup).** The IP address or DNS
       name of the storage device.
 
-   -  **Server (for VMFS).** The IP address or DNS name of the vCenter
+   -  **Server (for PreSetup or datastorecluster).** The IP address or DNS name of the vCenter
       server.
 
    -  **Path (for NFS).** In NFS this is the exported path from the
       server.
 
-   -  **Path (for VMFS).** In vSphere this is a combination of the
-      datacenter name and the datastore name. The format is "/"
-      datacenter name "/" datastore name. For example,
+   -  **Path (for PreSetup or datastorecluster).** In vSphere this is a combination of the
+      datacenter name and the datastore or datastore cluster name. The format is "/"
+      datacenter name "/" datastore or datastore cluster name. For example,
       "/cloud.dc.VM/cluster1datastore".
 
    -  **Path (for SharedMountPoint).** With KVM this is the path on each
       host that is where this primary storage is mounted. For example,
       "/mnt/primary".
 
+   -  **RADOS Monitor (for RBD).** With KVM, this is Ceph host domain/IP with
+      port. For example, "round-robin.ceph-cluster.xyz:6789".
+
+   -  **RADOS Pool (for RBD).** With KVM, this is Ceph pool name. For example,
+      "cloudstack".
+
+   -  **RADOS User (for RBD).** With KVM, this is Ceph client user name. For
+      example, "cloudstack".
+
+   -  **RADOS Secret (for RBD).** With KVM, this is the Ceph pool secret
+      authorised for a client username. For example, "AQC3u/JfhipzGBAACiILEFKembN8gTJsIvu6nQ==".
+
    -  **SMB Username** (for SMB/CIFS): Applicable only if you select
       SMB/CIFS provider. The username of the account which has the
       necessary permissions to the SMB shares. The user must be part of
diff --git a/source/installguide/index.rst b/source/installguide/index.rst
index 63dc803..01d9012 100644
--- a/source/installguide/index.rst
+++ b/source/installguide/index.rst
@@ -47,16 +47,6 @@
    management-server/index
 
 
-.. _primate:
-
-Primate Installation
---------------------
-.. toctree::
-   :maxdepth: 2
-
-   primate
-
-
 .. _configuration:
 
 Configuration
diff --git a/source/installguide/locale/pot/network_setup.pot b/source/installguide/locale/pot/network_setup.pot
index de25f63..cd759b0 100644
--- a/source/installguide/locale/pot/network_setup.pot
+++ b/source/installguide/locale/pot/network_setup.pot
@@ -1591,7 +1591,7 @@
 
 #: ../../network_setup.rst:1001
 # 99d0d664da654239ad897c4d6eb6b08e
-msgid "On CloudStack, add the Traffic Sentinel host by calling the CloudStack API command addTrafficMonitor. Pass in the URL of the Traffic Sentinel as protocol + host + port (optional); for example, http://10.147.28.100:8080. For the addTrafficMonitor command syntax, see the API Reference at `API Documentation <http://cloudstack.apache.org/docs/api/index.html>`_."
+msgid "On CloudStack, add the Traffic Sentinel host by calling the CloudStack API command addTrafficMonitor. Pass in the URL of the Traffic Sentinel as protocol + host + port (optional); for example, http://10.147.28.100:8080. For the addTrafficMonitor command syntax, see the API Reference at `API Documentation <https://cloudstack.apache.org/api.htmlindex.html>`_."
 msgstr ""
 
 #: ../../network_setup.rst:1008
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.mo b/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.mo
index 62eeffe..803c4b7 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.mo
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.mo
Binary files differ
diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.po b/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.po
index e2de713..8957f5d 100644
--- a/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.po
+++ b/source/installguide/locale/zh_CN/LC_MESSAGES/network_setup.po
@@ -1915,8 +1915,8 @@
 "command addTrafficMonitor. Pass in the URL of the Traffic Sentinel as "
 "protocol + host + port (optional); for example, http://10.147.28.100:8080. "
 "For the addTrafficMonitor command syntax, see the API Reference at `API "
-"Documentation <http://cloudstack.apache.org/docs/api/index.html>`_."
-msgstr "在CloudStack中,使用API中的addTrafficMonitor命令添加流量哨兵主机。传入的流量哨兵URL类似于protocol + host + port (可选);例如, http://10.147.28.100:8080。 关于addTrafficMonitor命令用法,请参阅API文档 `API Documentation <http://cloudstack.apache.org/docs/api/index.html>`_."
+"Documentation <https://cloudstack.apache.org/api.html>`_."
+msgstr "在CloudStack中,使用API中的addTrafficMonitor命令添加流量哨兵主机。传入的流量哨兵URL类似于protocol + host + port (可选);例如, http://10.147.28.100:8080。 关于addTrafficMonitor命令用法,请参阅API文档 `API Documentation <https://cloudstack.apache.org/api.html>`_."
 
 # 382c1696b18d4f25a2e2b5b7cb142225
 #: ../../network_setup.rst:1008
diff --git a/source/installguide/primate.rst b/source/installguide/primate.rst
deleted file mode 100644
index bb01464..0000000
--- a/source/installguide/primate.rst
+++ /dev/null
@@ -1,163 +0,0 @@
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-
-:ref:`primate-install-guide`
-
-Primate Guide
-=============
-
-What is Primate?
-~~~~~~~~~~~~~~~~
-
-Apache CloudStack Primate is a modern role-based progressive UI based on Vue.js
-and Ant Design for Apache CloudStack.
-
-.. image:: https://raw.githubusercontent.com/apache/cloudstack-primate/master/docs/screenshot-dashboard.png
-   :width: 800px
-   :alt: alternate text
-   :align: left
-
-With Apache CloudStack 4.14, a technical preview of Primate is proposed that
-users can evaluate. The technical preview release is not an officially voted
-release by the Apache CloudStack project but offers a snapshot build of Primate
-for users for testing and evaluation. The official Primate GA is expected with
-the next CloudStack release where the legacy UI will be deprecated, and the
-legacy UI will be removed in an eventual major CloudStack release.
-
-.. parsed-literal::
-
-    NOTE: Primate tech-preview is not suitable to run in production environments.
-
-`User participation in the community mailing lists
-<http://cloudstack.apache.org/mailing-lists.html>`_ is encouraged. Users may
-also log issues on Github https://github.com/apache/cloudstack-primate/issues
-
-Requirements
-~~~~~~~~~~~~
-
-Primate uses API auto-discovery to discover APIs allowed for a logged-in user
-and creates navigation and views based on that.
-
-- Apache CloudStack 4.13.1.0 or later
-- API auto-discovery (listApis enabled)
-- All modern browsers that are `ES5-compliant <https://github.com/vuejs/vue#browser-compatibility>`_
-
-In theory Primate can work with any older version of CloudStack.
-However, several Primate list views require API pagination support, some of which are
-available starting Apache CloudStack 4.13.1.0.
-
-Installation on CentOS
-~~~~~~~~~~~~~~~~~~~~~~
-
-Users running management server (4.13 or above) on CentOS can setup the
-following Primate tech-preview repository:
-
-.. parsed-literal::
-
-    rpm --import https://download.cloudstack.org/primate/release.asc
-    cat << EOF > /etc/yum.repos.d/cloudstack-primate-tech-preview.repo
-    [cloudstack-primate-tech-preview]
-    name=cloudstack
-    baseurl=https://download.cloudstack.org/primate/testing/preview/centos/
-    enabled=1
-    gpgcheck=1
-    gpgkey=https://download.cloudstack.org/primate/release.asc
-    EOF
-
-Next, install Primate:
-
-.. parsed-literal::
-
-    yum install cloudstack-primate
-
-Note: there is no need to restart management server post-installation, and
-after installation the UI can be accessed on
-management-server-host:8080/client/primate using any modern browser.
-
-Installation on Ubuntu
-~~~~~~~~~~~~~~~~~~~~~~
-
-Users running CloudStack management server (4.13 or above) on Ubuntu can setup the following Primate tech-preview repository:
-
-.. parsed-literal::
-
-    apt-key adv --keyserver keys.gnupg.net --recv-keys BDF0E176584DF93F
-    echo deb https://download.cloudstack.org/primate/testing/preview/debian / > /etc/apt/sources.list.d/cloudstack-primate-tech-preview.list
-
-Next, install Primate:
-
-.. parsed-literal::
-
-    apt-get update
-    apt-get install cloudstack-primate
-
-Note: there is no need to restart management server post-installation, and
-after installation the UI can be accessed on
-management-server-host:8080/client/primate using any modern browser.
-
-Using Archive
-~~~~~~~~~~~~~
-
-Primate archives are tarballs of single-page app builds. They can be simply
-downloaded and extracted to the management server webapp directory or hosted
-with a custom webserver.
-
-Users can download the builds from https://download.cloudstack.org/primate/testing/preview/archive/
-
-Using Docker
-~~~~~~~~~~~~
-
-Users can use docker builds of the tech preview from https://hub.docker.com/r/apache/cloudstack-primate
-
-For example:
-
-.. parsed-literal::
-
-    docker pull apache/cloudstack-primate:tech-preview
-    docker run -ti --rm -p 8080:80 -v $(pwd)/nginx:/etc/nginx/conf.d:ro apache/cloudstack-primate:tech-preview
-
-Example nginx config:
-
-.. parsed-literal::
-
-    server {
-        listen       80;
-        server_name  localhost;
-        location / {
-            root   /usr/share/nginx/html;
-            index  index.html;
-        }
-        location /client/ {
-            # http://127.0.0.1:8080 should be replaced your CloudStack management
-            # Server's actual URI
-            proxy_pass   http://127.0.0.1:8080;
-        }
-    }
-
-Known Issues and Missing Features
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- Support for network service providers
-- Support for S3 based secondary storage
-- Full support for all Quota plugin views
-- Group actions for events, alerts and instances
-- Metrics view cell-colouring
-- Authorisation management for SAML users
-- Filter by feature for searching
-- Guest network LB support for SSL certificate
-- Not all translations are fully migrated from legacy UI to Primate.
-- Feature and enhancements added in 4.14 except CloudStack Kubernetes Service and Backup and Recovery
-
-Please also refer to open issues on https://github.com/apache/cloudstack-primate/issues
diff --git a/source/plugins/cloudstack-kubernetes-service.rst b/source/plugins/cloudstack-kubernetes-service.rst
index 0c61de9..4290b6c 100644
--- a/source/plugins/cloudstack-kubernetes-service.rst
+++ b/source/plugins/cloudstack-kubernetes-service.rst
@@ -64,7 +64,7 @@
 
 .. parsed-literal::
 
-   # ./create-binaries-iso.sh ./ 1.12.5 0.7.1 1.12.0 "https://cloud.weave.works/k8s/net?k8s-version=1.12.5" https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-beta1/aio/deploy/recommended.yaml
+   # ./create-kubernetes-binaries-iso.sh ./ 1.12.5 0.7.1 1.12.0 "https://cloud.weave.works/k8s/net?k8s-version=1.12.5" https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-beta1/aio/deploy/recommended.yaml
 
 Working with Kubernetes supported version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -137,6 +137,9 @@
 
 This provides functionality to create Kubernetes clusters for Shared, Isolated and VPC networks in CloudStack, but such networks must be accessible to the CloudStack management server for provisioning virtual machines on the cluster. Template and default network offering must be set Global Settings for the service to create Kubernetes clusters.
 
+.. note::
+   In case of isolated and VPC networks, if egress rules and ACLs don't allow traffic the setup of the Kubernetes cluster and deployment of pods may fail due to inability of fetching the images from public network.
+
 The following Global Settings value must be set to the name of Template to be used for deploying node virtual machines for the respective hypervisor while creating a Kubernetes cluster:
 
 - **cloud.kubernetes.cluster.template.name.hyperv** (Name of the template to be used for creating Kubernetes cluster nodes on HyperV)
@@ -144,7 +147,10 @@
 - **cloud.kubernetes.cluster.template.name.vmware** (Name of the template to be used for creating Kubernetes cluster nodes on VMware)
 - **cloud.kubernetes.cluster.template.name.xenserver** (Name of the template to be used for creating Kubernetes cluster nodes on Xenserver)
 
-CoreOS templates for CloudStack can be found here, http://dl.openvm.eu/cloudstack/coreos/x86_64/
+Using a CoreOS template is required - you can find CoreOS templates for CloudStack here, http://dl.openvm.eu/cloudstack/coreos/x86_64/
+
+.. note::
+   For VMware, CoreOS template must be registered with root disk controller as **pvscsi** and NIC adapter type as **Vmxnet3**.
 
 The following Global Setting value must be set to the name of Network Offering to be used for creating a new network when no network has been selected while creating a Kubernetes cluster:
 
diff --git a/source/plugins/ovs-plugin.rst b/source/plugins/ovs-plugin.rst
index a570dfb..5c6799e 100644
--- a/source/plugins/ovs-plugin.rst
+++ b/source/plugins/ovs-plugin.rst
@@ -49,6 +49,12 @@
 Table: Supported Services
 
 .. note::
+   If you wish to use OVS as the default networking backend on Linux,
+   just follow this guide and CloudStack will automatically pick it up
+   based on the configuration in the agent.properties file. This in spite
+   of the OVS Plugin not being shown in the Network Service Providers.
+
+.. note::
    The Virtual Networking service was originally called 'Connectivity'
    in CloudStack 4.0
 
diff --git a/source/releasenotes/about.rst b/source/releasenotes/about.rst
index 45c88c2..8f336e8 100644
--- a/source/releasenotes/about.rst
+++ b/source/releasenotes/about.rst
@@ -17,25 +17,27 @@
 What's New in |release|
 =======================
 
-Apache CloudStack |release| is a |version| LTS release with over 15 major new features, and
-over 200 enhancements and fixes since 4.13.  Highlights include:
+Apache CloudStack |release| is a |version| LTS release with over 15 major new
+features, and over 250 enhancements and fixes since 4.14. Highlights include:
 
-•	New modern UI (Project Primate, Technical preview)
-•	Backup and Recovery framework
-•	Backup and Recovery Provider for Veeam
-•	VM ingestion
-•	L2 network PVLAN enhancements
-•	CloudStack Kubernetes Service
-•	UEFI support
-•	KVM rolling maintenance
-•	Enable Direct Download for systemVM templates
-•	VR health checks
-•	Download logs and diagnostics data from SSVM/CPVM/VRs
-•	Enable additional configuration metadata to virtual machines
-
+• New modern UI (GA release)
+• Support for CentOS8 and Ubuntu 20.04 for management server and KVM hosts (note: CentOS 8 will EOL in Dec 2021)
+• Support for XCP-ng 8.1
+• Support for MySQL 8
+• NoVNC console integration
+• Unmanaging guest VMs
+• VMware advanced storage capabilities (vSAN, vVols, VMFS6, datastore clusters)
+• VMware full OVF properties support
+• Secondary Storage usage improvements
+• PVLAN support for L2 networks
+• Role-based users in Projects
+• Dynamic roles improvements
+• Boot into BIOS on VMware
+• Redfish OOBM Support
+• Human readable sizes in logs
 
 The full list of new features can be found in the project release notes at
-http://docs.cloudstack.apache.org/en/4.14.0.0/releasenotes/changes.html
+http://docs.cloudstack.apache.org/en/4.15.0.0/releasenotes/changes.html
 
 .. important::
    This version of CloudStack allows control over the visibility of the DNS services provided
@@ -61,20 +63,33 @@
 
 For CentOS users using the security groups feature on KVM it is needed to install the epel-release and python36-libvirt packages.
 
-New User Interface & Depreciation notice of existing UI
+Workaround for adding newer KVM hosts
+=====================================
+
+Newer GNU/Linux distributions with latest OpenSSH package disables some older
+SSH algorithms and ciphers and newer algorithms are not supported by trilead-ssh
+library used by CloudStack to SSH into KVM hosts during the host-add operation.
+Until the dependency library can support that users can use the following
+workaround in their KVM host's /etc/ssh/sshd_config and restart ssh server
+before adding the KVM host in CloudStack:
+
+   PubkeyAcceptedKeyTypes=+ssh-dss
+
+   HostKeyAlgorithms=+ssh-dss
+
+   KexAlgorithms=+diffie-hellman-group1-sha1
+
+New UI GA and Legacy UI Deprecation and Removal Notice
 =======================================================
 
-Cloudstack 4.14 ships with a Technical Preview of a new, modern User Interface (project Primate).
-This technical preview can be used by users & operators of Cloudstack environments for evaluation
-& testing purposes. With version 4.14, the existing UI remains the supported UI for production environments.
-However, with the 4.14 release, the Apache Cloudstack community will stop taking feature requests
-for new functionality in the existing UI. All new functionality will be developed against the new UI.
+Cloudstack 4.15 ships with the GA release of a new and modern User Interface as
+the default UI which deprecates the current legacy UI. With version 4.15, the
+existing legacy UI (deprecated) along with the new UI are the supported UI for
+production environments.
 
+The default URL <host>:8080/client will serve the new UI and
+<host>:8080/client/legacy will serve the deprecated legacy UI.
 
-The next LTS release (likely to be version 4.15) of Apache Cloudstack will ship with the production
-release of the new UI. It will also be the last version of CloudStack to ship with the old UI. This
-release will also have the final deprecation notice for the old UI.
-
-In the following release (likely to be 4.16), the old UI will be deprecated.
-
-Please see `Primate install guide <../installguide/primate.html>`_
+In the next release (4.16), the Apache Cloudstack community will remove the legacy
+UI. Users are encouraged to implement a migration path towards deprecating the
+legacy UI in their production environments.
diff --git a/source/releasenotes/api-changes.rst b/source/releasenotes/api-changes.rst
index cefdf74..437d7eb 100644
--- a/source/releasenotes/api-changes.rst
+++ b/source/releasenotes/api-changes.rst
@@ -13,7 +13,7 @@
    specific language governing permissions and limitations
    under the License.
 
-API Changes Introduced in 4.14.0.0
+API Changes Introduced in 4.15.0.0
 ===================================
 For the complete list of API commands and params consult the `CloudStack Apidocs`_.
 
@@ -25,77 +25,51 @@
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | Name                                        | Description                                                                    |
 +=============================================+================================================================================+
-| ``startRollingMaintenance``                 | Start rolling maintenance                                                      |
+| ``listVsphereStoragePolicyCompatiblePools`` | List storage pools compatible with a vSphere storage policy                    |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``createBackupSchedule``                    | Creates a user-defined VM backup schedule                                      |
+| ``listProjectRolePermissions``              | Lists a project's project role permissions                                     |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listBackupOfferings``                     | Lists backup offerings                                                         |
+| ``importVsphereStoragePolicies``            | Import vSphere storage policies                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``createBackup``                            | Create VM backup                                                               |
+| ``migrateSecondaryStorageData``             | migrates data objects from one secondary storage to destination image store(s) |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``stopKubernetesCluster``                   | Stops a running Kubernetes cluster                                             |
+| ``unmanageVirtualMachine``                  | Unmanage a guest virtual machine.                                              |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listKubernetesClusters``                  | Lists Kubernetes clusters                                                      |
+| ``updateImageStore``                        | Updates image store read-only status                                           |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``scaleKubernetesCluster``                  | Scales a created, running or stopped Kubernetes cluster                        |
+| ``deleteProjectRole``                       | Delete Project roles in CloudStack                                             |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``destroyVolume``                           | Destroys a Volume.                                                             |
+| ``deleteUserFromProject``                   | Deletes user from the project                                                  |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``deleteBackupOffering``                    | Deletes a backup offering                                                      |
+| ``listProjectRoles``                        | Lists Project roles in CloudStack                                              |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``updateSecurityGroup``                     | Updates a security group                                                       |
+| ``createProjectRole``                       | Creates a Project role                                                         |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``getRouterHealthCheckResults``             | Starts a router.                                                               |
+| ``updateProjectRole``                       | Creates a Project role                                                         |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listBackups``                             | Lists VM backups                                                               |
+| ``listVsphereStoragePolicies``              | List vSphere storage policies                                                  |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listBackupProviders``                     | Lists Backup and Recovery providers                                            |
+| ``createProjectRolePermission``             | Adds API permissions to a project role                                         |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``deleteKubernetesSupportedVersion``        | Deletes a Kubernetes cluster                                                   |
+| ``updateProjectRolePermission``             | Updates a project role permission and/or order                                 |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``restoreBackup``                           | Restores an existing stopped or deleted VM using a VM backup                   |
+| ``addUserToProject``                        | Adds user to a project                                                         |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``addKubernetesSupportedVersion``           | Add a supported Kubernetes version                                             |
+| ``importRole``                              | Imports a role based on provided map of rule permissions                       |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``deleteKubernetesCluster``                 | Deletes a Kubernetes cluster                                                   |
+| ``deleteProjectRolePermission``             | Deletes a project role permission in the project                               |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``getKubernetesClusterConfig``              | Get Kubernetes cluster config                                                  |
+
+
+Removed API Commands
+--------------------
+
+.. cssclass:: table-striped table-bordered table-hover
+
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``updateKubernetesSupportedVersion``        | Update a supported Kubernetes version                                          |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``upgradeKubernetesCluster``                | Upgrades a running Kubernetes cluster                                          |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``deleteBackupSchedule``                    | Deletes the backup schedule of a VM                                            |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listBackupProviderOfferings``             | Lists external backup offerings of the provider                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``createKubernetesCluster``                 | Creates a Kubernetes cluster                                                   |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``importBackupOffering``                    | Imports a backup offering using a backup provider                              |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``removeVirtualMachineFromBackupOffering``  | Removes a VM from any existing backup offering                                 |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listKubernetesSupportedVersions``         | Lists container clusters                                                       |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``recoverVolume``                           | Recovers a Destroy volume.                                                     |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listUnmanagedInstances``                  | Lists unmanaged virtual machines for a given cluster.                          |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``importUnmanagedInstance``                 | Import unmanaged virtual machine from a given cluster.                         |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``getDiagnosticsData``                      | Get diagnostics and files from system VMs                                      |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``startKubernetesCluster``                  | Starts a stopped Kubernetes cluster                                            |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listBackupSchedule``                      | List backup schedule of a VM                                                   |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``restoreVolumeFromBackupAndAttachToVM``    | Restore and attach a backed up volume to VM                                    |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``updateBackupSchedule``                    | Updates a user-defined VM backup schedule                                      |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``deleteBackup``                            | Delete VM backup                                                               |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``assignVirtualMachineToBackupOffering``    | Assigns a VM to a backup offering                                              |
+| Name                                        | Description                                                                    |
++=============================================+================================================================================+
+| ``listTemplateOvfProperties``               | List template OVF properties if available.                                     |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 
 
@@ -107,552 +81,1295 @@
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | Name                                        | Description                                                                    |
 +=============================================+================================================================================+
+| ``copyIso``                                 | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listVirtualMachinesMetrics``              | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``haenable`` (optional)                                                      |
+|                                             | - ``securitygroupid`` (optional)                                               |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
 | ``listHosts``                               | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
-|                                             |                                                                                |
-|                                             | *Removed Parameters:*                                                          |
-|                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``importLdapUsers``                         | **Response:**                                                                  |
+| ``updateStoragePool``                       | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``conflictingusersource``                                                    |
+|                                             | - ``name`` (optional)                                                          |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listHostsMetrics``                        | **Response:**                                                                  |
+| ``rebootSystemVm``                          | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listNetworks``                            | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``networkofferingid`` (optional)                                             |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``restoreVirtualMachine``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``updateHost``                              | **Response:**                                                                  |
+| ``updateHost``                              | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
+|                                             | - ``name`` (optional)                                                          |
 |                                             |                                                                                |
-|                                             | *Removed Parameters:*                                                          |
+|                                             | **Response:**                                                                  |
 |                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``destroySystemVm``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``addSwift``                                | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``scaleSystemVm``                           | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``stopRouter``                              | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``changeServiceForVirtualMachine``          | **Response:**                                                                  |
+| ``listProjectInvitations``                  | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``userid`` (optional)                                                        |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``userid``                                                                   |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listLdapConfigurations``                  | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``listall`` (optional)                                                       |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listSecondaryStagingStores``              | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``startRouter``                             | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``rebootVirtualMachine``                    | **Response:**                                                                  |
+| ``changeServiceForVirtualMachine``          | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listVolumesMetrics``                      | **Request:**                                                                   |
+| ``listTemplates``                           | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``state`` (optional)                                                         |
+|                                             | - ``details`` (optional)                                                       |
+|                                             | - ``showunique`` (optional)                                                    |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listPhysicalNetworks``                    | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``zonename``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createSecondaryStagingStore``             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``rebootVirtualMachine``                    | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``bootintosetup`` (optional)                                                 |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateVPC``                               | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcofferingname``                                                          |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``stopSystemVm``                            | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listPrivateGateways``                     | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``updateVmNicIp``                           | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``startInternalLoadBalancerVM``             | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``searchLdap``                              | **Response:**                                                                  |
+| ``updateDiskOffering``                      | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``conflictingusersource``                                                    |
+|                                             | - ``bytesreadrate`` (optional)                                                 |
+|                                             | - ``bytesreadratemax`` (optional)                                              |
+|                                             | - ``bytesreadratemaxlength`` (optional)                                        |
+|                                             | - ``byteswriterate`` (optional)                                                |
+|                                             | - ``byteswriteratemax`` (optional)                                             |
+|                                             | - ``byteswriteratemaxlength`` (optional)                                       |
+|                                             | - ``cachemode`` (optional)                                                     |
+|                                             | - ``iopsreadrate`` (optional)                                                  |
+|                                             | - ``iopsreadratemax`` (optional)                                               |
+|                                             | - ``iopsreadratemaxlength`` (optional)                                         |
+|                                             | - ``iopswriterate`` (optional)                                                 |
+|                                             | - ``iopswriteratemax`` (optional)                                              |
+|                                             | - ``iopswriteratemaxlength`` (optional)                                        |
+|                                             | - ``tags`` (optional)                                                          |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vspherestoragepolicy``                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``addAccountToProject``                     | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``projectroleid`` (optional)                                                 |
+|                                             | - ``roletype`` (optional)                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listKubernetesClusters``                  | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``ipaddress``                                                                |
+|                                             | - ``ipaddressid``                                                              |
+|                                             | - ``virtualmachines``                                                          |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``virtualmachineids``                                                        |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``scaleKubernetesCluster``                  | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *Changed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``id`` was 'optional' and is now 'required'                                  |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``ipaddress``                                                                |
+|                                             | - ``ipaddressid``                                                              |
+|                                             | - ``virtualmachines``                                                          |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``virtualmachineids``                                                        |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``stopNetScalerVpx``                        | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listCapabilities``                        | **Response:**                                                                  |
+| ``updatePhysicalNetwork``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``allowuserexpungerecovervolume``                                            |
-|                                             | - ``kubernetesclusterexperimentalfeaturesenabled``                             |
-|                                             | - ``kubernetesserviceenabled``                                                 |
+|                                             | - ``zonename``                                                                 |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listLdapUsers``                           | **Request:**                                                                   |
+| ``createRolePermission``                    | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``description``                                                              |
+|                                             | - ``permission``                                                               |
+|                                             | - ``rule``                                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listSystemVms``                           | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``domainid`` (optional)                                                      |
-|                                             | - ``userfilter`` (optional)                                                    |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createProject``                           | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``accountid`` (optional)                                                     |
+|                                             | - ``userid`` (optional)                                                        |
 |                                             |                                                                                |
 |                                             | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``conflictingusersource``                                                    |
+|                                             | - ``owner``                                                                    |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``changeServiceForSystemVm``                | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``rebootRouter``                            | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listNics``                                | **Response:**                                                                  |
+| ``findHostsForMigration``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``adaptertype``                                                              |
-|                                             | - ``ipaddresses``                                                              |
-|                                             | - ``isolatedpvlan``                                                            |
-|                                             | - ``isolatedpvlantype``                                                        |
-|                                             | - ``vlanid``                                                                   |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``addNicToVirtualMachine``                  | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listExternalLoadBalancers``               | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
-|                                             |                                                                                |
-|                                             | *Removed Parameters:*                                                          |
-|                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``updateDefaultNicForVirtualMachine``       | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``stopInternalLoadBalancerVM``              | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``createServiceOffering``                   | **Request:**                                                                   |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``cachemode`` (optional)                                                     |
-|                                             |                                                                                |
-|                                             | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``cacheMode``                                                                |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``assignVirtualMachine``                    | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``changeServiceForRouter``                  | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``updateVirtualMachine``                    | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``migrateVirtualMachine``                   | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``resetPasswordForVirtualMachine``          | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``associateIpAddress``                      | **Request:**                                                                   |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``ipaddress`` (optional)                                                     |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``resetSSHKeyForVirtualMachine``            | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listInternalLoadBalancerVMs``             | **Request:**                                                                   |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``fetchhealthcheckresults`` (optional)                                       |
-|                                             |                                                                                |
-|                                             | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``detachIso``                               | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``prepareHostForMaintenance``               | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
-|                                             |                                                                                |
-|                                             | *Removed Parameters:*                                                          |
-|                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listVirtualMachines``                     | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``revertToVMSnapshot``                      | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``deployVirtualMachine``                    | **Request:**                                                                   |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``bootmode`` (optional)                                                      |
-|                                             | - ``boottype`` (optional)                                                      |
-|                                             |                                                                                |
-|                                             | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``cancelHostMaintenance``                   | **Response:**                                                                  |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
-|                                             |                                                                                |
-|                                             | *Removed Parameters:*                                                          |
-|                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``createDiskOffering``                      | **Request:**                                                                   |
-|                                             |                                                                                |
-|                                             | *New Parameters:*                                                              |
-|                                             |                                                                                |
-|                                             | - ``cachemode`` (optional)                                                     |
-|                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listVolumes``                             | **Request:**                                                                   |
+| ``listStaticRoutes``                        | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
 |                                             | - ``state`` (optional)                                                         |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``createNetwork``                           | **Request:**                                                                   |
+| ``listPublicIpAddresses``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``isolatedpvlantype`` (optional)                                             |
+|                                             | - ``networkname``                                                              |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateIso``                               | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listExternalLoadBalancers``               | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateDefaultNicForVirtualMachine``       | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``prepareTemplate``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``stopInternalLoadBalancerVM``              | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``restartNetwork``                          | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``networkname``                                                              |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``addImageStore``                           | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listRolePermissions``                     | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``description``                                                              |
+|                                             | - ``permission``                                                               |
+|                                             | - ``rule``                                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listNetworkACLs``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``copyTemplate``                            | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createServiceOffering``                   | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``rootdisksize`` (optional)                                                  |
+|                                             | - ``storagepolicy`` (optional)                                                 |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``rootdisksize``                                                             |
+|                                             | - ``vspherestoragepolicy``                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listNiciraNvpDeviceNetworks``             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``assignVirtualMachine``                    | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateTemplate``                          | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``templatetype`` (optional)                                                  |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listPaloAltoFirewallNetworks``            | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``changeServiceForRouter``                  | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateVirtualMachine``                    | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``addSecondaryStorage``                     | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateNetwork``                           | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateVpnGateway``                        | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``migrateVirtualMachine``                   | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createTemplate``                          | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``resetPasswordForVirtualMachine``          | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``associateIpAddress``                      | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``networkname``                                                              |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createNetworkACL``                        | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``resetSSHKeyForVirtualMachine``            | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createVPC``                               | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcofferingname``                                                          |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listInternalLoadBalancerVMs``             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listSrxFirewallNetworks``                 | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``detachIso``                               | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createRole``                              | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``roleid`` (optional)                                                        |
+|                                             |                                                                                |
+|                                             | *Changed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``type`` was 'required' and is now 'optional'                                |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``isdefault``                                                                |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``id``                                                                       |
+|                                             | - ``description``                                                              |
+|                                             | - ``name``                                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``prepareHostForMaintenance``               | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listVirtualMachines``                     | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``haenable`` (optional)                                                      |
+|                                             | - ``securitygroupid`` (optional)                                               |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listDiskOfferings``                       | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vspherestoragepolicy``                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``upgradeKubernetesCluster``                | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``ipaddress``                                                                |
+|                                             | - ``ipaddressid``                                                              |
+|                                             | - ``virtualmachines``                                                          |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``virtualmachineids``                                                        |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listProjects``                            | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``username`` (optional)                                                      |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``owner``                                                                    |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``revertToVMSnapshot``                      | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``registerIso``                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``deployVirtualMachine``                    | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``bootintosetup`` (optional)                                                 |
+|                                             | - ``nicnetworklist`` (optional)                                                |
+|                                             | - ``properties`` (optional)                                                    |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``ovfproperties``                                                            |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``cancelHostMaintenance``                   | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listProjectAccounts``                     | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``projectroleid`` (optional)                                                 |
+|                                             | - ``userid`` (optional)                                                        |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``owner``                                                                    |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createDiskOffering``                      | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``storagepolicy`` (optional)                                                 |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vspherestoragepolicy``                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createNetwork``                           | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listVPCs``                                | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcofferingname``                                                          |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``migrateVirtualMachineWithVolume``         | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``restartVPC``                              | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcofferingname``                                                          |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``addHost``                                 | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateProject``                           | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``roletype`` (optional)                                                      |
+|                                             | - ``swapowner`` (optional)                                                     |
+|                                             | - ``userid`` (optional)                                                        |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``owner``                                                                    |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listIsos``                                | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``showunique`` (optional)                                                    |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateCloudToUseObjectStore``             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateRole``                              | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``isdefault``                                                                |
 |                                             |                                                                                |
 |                                             | *Removed Parameters:*                                                          |
 |                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
+|                                             | - ``id``                                                                       |
+|                                             | - ``description``                                                              |
+|                                             | - ``name``                                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listNetscalerLoadBalancerNetworks``       | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``startSystemVm``                           | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createKubernetesCluster``                 | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``ipaddress``                                                                |
+|                                             | - ``ipaddressid``                                                              |
+|                                             | - ``virtualmachines``                                                          |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``virtualmachineids``                                                        |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``updateVMAffinityGroup``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``migrateVPC``                              | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcofferingname``                                                          |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``recoverVirtualMachine``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listRouters``                             | **Request:**                                                                   |
+| ``getUploadParamsForTemplate``              | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *Changed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``ostypeid`` was 'required' and is now 'optional'                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateProjectInvitation``                 | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``fetchhealthcheckresults`` (optional)                                       |
+|                                             | - ``userid`` (optional)                                                        |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``migrateSystemVm``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listVpnGateways``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listRoles``                               | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``isdefault``                                                                |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``id``                                                                       |
+|                                             | - ``description``                                                              |
+|                                             | - ``name``                                                                     |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateNetworkACLItem``                    | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listRouters``                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listBrocadeVcsDeviceNetworks``            | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listSwifts``                              | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listUsageRecords``                        | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``ostypeid``                                                                 |
+|                                             | - ``vpcid``                                                                    |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``suspendProject``                          | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``owner``                                                                    |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``updateIpAddress``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``networkname``                                                              |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``migrateNetwork``                          | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``registerTemplate``                        | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *Changed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``ostypeid`` was 'required' and is now 'optional'                            |
 |                                             |                                                                                |
 |                                             | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
+|                                             | - ``deployasis``                                                               |
+|                                             | - ``deployasisdetails``                                                        |
+|                                             | - ``downloaddetails``                                                          |
+|                                             | - ``url``                                                                      |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``importUnmanagedInstance``                 | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``forced`` (optional)                                                        |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``addImageStoreS3``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createPhysicalNetwork``                   | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``zonename``                                                                 |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listF5LoadBalancerNetworks``              | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listVMSnapshot``                          | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``hypervisor``                                                               |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``moveNetworkAclItem``                      | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``attachIso``                               | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createVpnGateway``                        | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createVMSnapshot``                        | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``hypervisor``                                                               |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``destroyRouter``                           | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``healthchecksfailed``                                                       |
-|                                             | - ``healthcheckresults(*)``                                                    |
+|                                             | - ``podname``                                                                  |
+|                                             | - ``templatename``                                                             |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``listImageStores``                         | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``readonly`` (optional)                                                      |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``disksizetotal``                                                            |
+|                                             | - ``disksizeused``                                                             |
+|                                             | - ``readonly``                                                                 |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``removeNicFromVirtualMachine``             | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``activateProject``                         | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``owner``                                                                    |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``reconnectHost``                           | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
-|                                             |                                                                                |
-|                                             | *Removed Parameters:*                                                          |
-|                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``createPrivateGateway``                    | **Request:**                                                                   |
+| ``startKubernetesCluster``                  | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``bypassvlanoverlapcheck`` (optional)                                        |
+|                                             | - ``ipaddress``                                                                |
+|                                             | - ``ipaddressid``                                                              |
+|                                             | - ``virtualmachines``                                                          |
+|                                             |                                                                                |
+|                                             | *Removed Parameters:*                                                          |
+|                                             |                                                                                |
+|                                             | - ``virtualmachineids``                                                        |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``createPrivateGateway``                    | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``aclname``                                                                  |
+|                                             | - ``vpcname``                                                                  |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+| ``uploadSslCert``                           | **Request:**                                                                   |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``enabledrevocationcheck`` (optional)                                        |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``addBaremetalHost``                        | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cpuloadaverage``                                                           |
-|                                             | - ``ueficapability``                                                           |
-|                                             |                                                                                |
-|                                             | *Removed Parameters:*                                                          |
-|                                             |                                                                                |
-|                                             | - ``averageload``                                                              |
+|                                             | - ``cpuallocatedpercentage``                                                   |
+|                                             | - ``cpuallocatedvalue``                                                        |
+|                                             | - ``cpuallocatedwithoverprovisioning``                                         |
+|                                             | - ``memoryallocatedbytes``                                                     |
+|                                             | - ``memoryallocatedpercentage``                                                |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``destroyVirtualMachine``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``osdisplayname``                                                            |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``listServiceOfferings``                    | **Response:**                                                                  |
+| ``listServiceOfferings``                    | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cacheMode``                                                                |
+|                                             | - ``cpunumber`` (optional)                                                     |
+|                                             | - ``cpuspeed`` (optional)                                                      |
+|                                             | - ``memory`` (optional)                                                        |
 |                                             |                                                                                |
-+---------------------------------------------+--------------------------------------------------------------------------------+
-| ``startVirtualMachine``                     | **Response:**                                                                  |
+|                                             | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``rootdisksize``                                                             |
+|                                             | - ``vspherestoragepolicy``                                                     |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
-| ``stopVirtualMachine``                      | **Response:**                                                                  |
+| ``startVirtualMachine``                     | **Request:**                                                                   |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``backupofferingid``                                                         |
-|                                             | - ``backupofferingname``                                                       |
-|                                             | - ``bootmode``                                                                 |
-|                                             | - ``boottype``                                                                 |
+|                                             | - ``bootintosetup`` (optional)                                                 |
+|                                             |                                                                                |
+|                                             | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
 | ``updateServiceOffering``                   | **Response:**                                                                  |
 |                                             |                                                                                |
 |                                             | *New Parameters:*                                                              |
 |                                             |                                                                                |
-|                                             | - ``cacheMode``                                                                |
+|                                             | - ``rootdisksize``                                                             |
+|                                             | - ``vspherestoragepolicy``                                                     |
 |                                             |                                                                                |
 +---------------------------------------------+--------------------------------------------------------------------------------+
+| ``stopVirtualMachine``                      | **Response:**                                                                  |
+|                                             |                                                                                |
+|                                             | *New Parameters:*                                                              |
+|                                             |                                                                                |
+|                                             | - ``osdisplayname``                                                            |
+|                                             |                                                                                |
++---------------------------------------------+--------------------------------------------------------------------------------+
+
diff --git a/source/releasenotes/changes.rst b/source/releasenotes/changes.rst
index 7c4d097..a04c1a1 100644
--- a/source/releasenotes/changes.rst
+++ b/source/releasenotes/changes.rst
@@ -15,7 +15,7 @@
 
 
 
-Changes in |release| since 4.13
+Changes in |release| since 4.14
 ===============================
 
 Apache CloudStack uses GitHub <https://github.com/apache/cloudstack/issues>`_ 
@@ -28,723 +28,867 @@
 +-------------------------+----------+------------------------------------------------------------+
 | Version                 | Github   | Description                                                |
 +=========================+==========+============================================================+
-| 4.14.0.0                | `#4064`_ | fix dhcp lease entry wrong hostname                        |
+| 4.15.0.0                | `#4568`_ | kvm: Fix double-escape issue while creating rbd disk       |
+|                         |          | options                                                    |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4057`_ | Allow deleting snapshot on local filesystem                |
+| 4.15.0.0                | `#4559`_ | networkorchestrator: Fix typo in exception message         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3992`_ | cks: use public links for templates and binaries iso for   |
-|                         |          | smoke tests                                                |
+| 4.15.0.0                | `#4553`_ | Fix for mapping guest OS type read from OVF to existing    |
+|                         |          | guest OS in C…                                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4055`_ | db.properties: Enforce UTC timezone by default             |
+| 4.15.0.0                | `#4555`_ | VMware: Fix template upload from local                     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4042`_ | Fixed guest vlan range going missing when using zone       |
-|                         |          | wizard                                                     |
+| 4.15.0.0                | `#4540`_ | Bug/unmanaged ingest exceptions #4539                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4043`_ | Volume deleted during cold migration if Secondary Storage  |
-|                         |          | over 90% full                                              |
+| 4.15.0.0                | `#4529`_ | vr: Ensuring dnsmasq.leases file is populated              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4029`_ | Bring back vm.suspend during deleting VM snapshot          |
+| 4.15.0.0                | `#4522`_ | template: Ensuring template is cross zone if type changed  |
+|                         |          | to system                                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4033`_ | kvm: suspend/resume in deleting vm snapshot on kvm         |
+| 4.15.0.0                | `#4516`_ | Fix hypervisor type cast to string                         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4023`_ | FIX: prevent empty sshkey name.                            |
+| 4.15.0.0                | `#4533`_ | db upgrade: use "create or replace view" instead of "alter |
+|                         |          | view"                                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3969`_ | Snapshot deletion issues                                   |
+| 4.15.0.0                | `#4536`_ | CLOUDSTACK-10423:Potential sensitive information           |
+|                         |          | disclosure                                                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4025`_ | server: Cannot list affinity group if there are hosts      |
-|                         |          | dedicated to domain                                        |
+| 4.15.0.0                | `#4538`_ | CLOUDSTACK-10425:Potential sensitive information           |
+|                         |          | disclosure                                                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4014`_ | Improvement on build time and new quality profile          |
+| 4.15.0.0                | `#4511`_ | listphysicalnetworks: Honouring keyword parameter          |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4002`_ | server: Search zone-wide storage pool when allocation      |
-|                         |          | algothrim is firstfitleastconsumed                         |
+| 4.15.0.0                | `#4530`_ | extract volume: Fix NPE when Volume exists on secondary    |
+|                         |          | store but doesn't have a download URL                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3984`_ | Remove rolling-maintenance service from debian rules       |
+| 4.15.0.0                | `#4532`_ | apidoc issue                                               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3999`_ | Update schema-41310to41400.sql                             |
+| 4.15.0.0                | `#4526`_ | db: Fix description of volume.stats.interval which is in   |
+|                         |          | milliseconds…                                              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4008`_ | Fix template registration error                            |
+| 4.15.0.0                | `#4527`_ | kvm: set cpu topology only if cpucore per socket is set    |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3988`_ | Add support for zulu-11 in cloudstack 4.14                 |
+| 4.15.0.0                | `#4525`_ | xenserver: check and eject patch vbd for systemvms         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#4005`_ | Fixed create template from snapshot never returning        |
+| 4.15.0.0                | `#4523`_ | Fix warning when setup cloudstack-common                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3995`_ | UI bug fix: Cannot deploy VM from ISO                      |
+| 4.15.0.0                | `#4497`_ | kvm: FIX cpucorespersocket is not working on KVM           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3993`_ | Fixes raw templates not downloading                        |
+| 4.15.0.0                | `#4521`_ | change debug to warn for unknown exceptions                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3977`_ | With basic zone and VMware hypervisor, VR fails to start   |
+| 4.15.0.0                | `#4507`_ | Fix failure in validating IP address in case of multiple   |
+|                         |          | Management Servers                                         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3973`_ | systemd dependency on db                                   |
+| 4.15.0.0                | `#4515`_ | Update log output for FirstFitPlanner                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3956`_ | maven quality tool plugins                                 |
+| 4.15.0.0                | `#4518`_ | ui: deprecate old UI and move to legacy to be served at    |
+|                         |          | /client/legacy                                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3985`_ | NPE fix for System VM's start Command                      |
+| 4.15.0.0                | `#4510`_ | Adding zone name to physicalnetworkresponse                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3989`_ | server: export full response view for zones response for   |
-|                         |          | root admin                                                 |
+| 4.15.0.0                | `#4501`_ | Disallowing udp for lb rules for haproxy                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3972`_ | Updated upgrade paths                                      |
+| 4.15.0.0                | `#4505`_ | Make global setting "secstorage.max.migrate.sessions"      |
+|                         |          | non-dynamic                                                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3971`_ | Updated upgrade path                                       |
+| 4.15.0.0                | `#4499`_ | Adding cpuallocated percentage and value to host and       |
+|                         |          | hostsformigrationresponse                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3587`_ | vrouter in redundant mode acquire guest ips from first ip  |
-|                         |          | of the tier                                                |
+| 4.15.0.0                | `#4496`_ | kvm: fix router.aggregation.command.each.timeout is reset  |
+|                         |          | to 600 when update other kvm configs                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3839`_ | FEATURE-3823: kvm agent hooks                              |
+| 4.15.0.0                | `#4495`_ | fix failures with test_multiple_nic_support.py             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3638`_ | UEFI Support on CloudStack                                 |
+| 4.15.0.0                | `#4500`_ | Fix hosts for migration count                              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3960`_ | Rename max.retries setting                                 |
+| 4.15.0.0                | `#4494`_ | sql: Fix Zones are returned in a random order (#3934)      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3932`_ | Prevent overflow on StatsCollector.java                    |
+| 4.15.0.0                | `#4489`_ | vr: fix python exception when configure VRs                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3681`_ | Validate disk offering IOPS normal and maximum read/write  |
-|                         |          | values                                                     |
+| 4.15.0.0                | `#4361`_ | Add vpcid in usage network response                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3962`_ | Make text clear regarding removing data disks.             |
+| 4.15.0.0                | `#4486`_ | Add event for VM recovery operation                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3963`_ | Handle port forward rule check for vpc and non vpc         |
-|                         |          | Isolated networks                                          |
+| 4.15.0.0                | `#4483`_ | Display VPC name to which the network belongs to           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3610`_ | [KVM] Rolling maintenance                                  |
+| 4.15.0.0                | `#4425`_ | Setting snapshot removed on timeout                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3948`_ | server: password is not displayed when reinstall a vm or   |
-|                         |          | reset ssh key                                              |
+| 4.15.0.0                | `#4392`_ | Fixed double slash in secret breaking db insert            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3953`_ | Revert "CLOUDSTACK-10271 maven plugin for owasp dependency |
-|                         |          | check added"                                               |
+| 4.15.0.0                | `#4467`_ | vpc: fix ips on wrong interfaces after rebooting vpc vrs   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3925`_ | Add cache mode param properly                              |
+| 4.15.0.0                | `#4480`_ | Fix migrateVMwithVolumes API in case of multiple volumes   |
+|                         |          | on VMware                                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#2446`_ | CLOUDSTACK-10271 maven plugin for owasp dependency check   |
-|                         |          | added                                                      |
+| 4.15.0.0                | `#4478`_ | Adding memoryallocatedpercentage & memoryallocatedbytes to |
+|                         |          | HostsResponse & HostsForMigrationResponse                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3657`_ | cleanup for resources left by test_accounts and            |
-|                         |          | test_project                                               |
+| 4.15.0.0                | `#4466`_ | VR: fix logging is not working and logs are not appended   |
+|                         |          | to /var/log/cloud.log                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3943`_ | vr: fix password server run with empty gateway in isolated |
-|                         |          | network with RVRs                                          |
+| 4.15.0.0                | `#4458`_ | Fix k8s cluster upgrade in shared networks                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3940`_ | Regression Fix: Allow full response view to Admin user     |
+| 4.15.0.0                | `#4487`_ | accountresponse: Fix domainpath description                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3828`_ | [KVM] Direct download agnostic of the storage provider     |
+| 4.15.0.0                | `#4459`_ | createkubertetesbinariesiso: Saving images in network and  |
+|                         |          | dashboard yaml                                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3651`_ | Fix simulator docker db deploy issue (apache#3397)         |
+| 4.15.0.0                | `#4485`_ | Fixing misleading HostMetricsResponse param description    |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3947`_ | server: fix database exception while searching network     |
-|                         |          | offerings                                                  |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3935`_ | Fix VM with ISO attached migration issue                   |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3919`_ | Handle EOFException during VR Health Check                 |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3680`_ | CloudStack Kubernetes Service                              |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3862`_ | Userdata to display static NAT as public ip instead of VR  |
-|                         |          | ip                                                         |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3924`_ | Fixed error on data volumes lager than 2.14TB when         |
-|                         |          | creating instances on VMware                               |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3928`_ | maven: update dependencies                                 |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3911`_ | kvm: fix/optimize propogating configs                      |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3930`_ | Remove unused guest OS mapping class from Vmware code      |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3927`_ | ui: fix merge issue that causes VR duplicates              |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3553`_ | CloudStack Backup & Recovery Framework                     |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3901`_ | Removed unused vars from pom file                          |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3847`_ | VR: Fix Redundant VRouter guest network on wrong interface |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3898`_ | vrouter: reload keepalived instead of restart and fix      |
-|                         |          | password server issues when add/remove vpc tier            |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3907`_ | Allow port 80/8080 accessible only from guest network      |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3916`_ | server: fix issue while list ssh keypairs by keyword       |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3913`_ | Fix dhcp infinite lease time                               |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3904`_ | Avoid duplicate alerts when router state changes           |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3903`_ | VR: Send VM password to all Running VRs in network/vpc     |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3894`_ | api: Fix count and item issues returned by list APIs       |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3731`_ | Enable Direct Download for systemVM templates              |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3899`_ | vpc: add bypassvlanoverlapcheck parameter when create      |
-|                         |          | private gateway                                            |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3905`_ | Fix network rules issue if default egress policy is Allow  |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3639`_ | Multiple networks support for vms in advanced zone with    |
-|                         |          | security group (and kvm support)                           |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3491`_ | KVM: Propagating changes on host parameters to the agents  |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3879`_ | kvm: Enable virtio drivers based on guest os display name  |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3739`_ | Add new command to update security group name              |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3884`_ | kvm: fix exception in volume stats after storage migration |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3882`_ | remove duplicate index region                              |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3864`_ | Ignore site to site vpn status check on internallbvm       |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3880`_ | simulator: fix travis failure after merging volume         |
-|                         |          | destroy/recover                                            |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3871`_ | Fixed duplicate id error when creating VM work jobs        |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3873`_ | Fixed root volume resize from ui                           |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3877`_ | [SECURITY] Use HTTPS to resolve dependencies in Maven      |
-|                         |          | Build                                                      |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3601`_ | JDK11 support                                              |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3876`_ | server: use host record related to a ssvm/cpvm             |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3732`_ | [Vmware] Enable PVLAN support on L2 networks               |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3870`_ | systemvm: list systemvm does not return agent state and    |
-|                         |          | version                                                    |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3688`_ | New feature: Add support to destroy/recover volumes        |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3854`_ | Install python-dnspython or python-dns to fix issue with   |
-|                         |          | cloudstack-setup-management                                |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3865`_ | Fixed default text missing from network selection on       |
-|                         |          | instance wizard                                            |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3869`_ | packaging: install python-dnspython or python-dns to fix   |
-|                         |          | issue with c…                                              |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3805`_ | UI: Display drop down list for VPN customer gateway        |
-|                         |          | selection                                                  |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3844`_ | ISSUE-3838: Wrong SSVM behavior causes redownloading for   |
-|                         |          | all the templates                                          |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3865`_ | Fixed default text missing from network selection on       |
-|                         |          | instance wizard                                            |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3857`_ | vr: add missing rule for port forwarding rule in vpc       |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3851`_ | vpc: set traffic type of private gateway IP to Public to   |
-|                         |          | fix keepalived misconfiguration                            |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3867`_ | Usage event to store zone id while uploading template and  |
-|                         |          | volume                                                     |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3861`_ | test: check more connectivity in test_privategw_acl.py     |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3863`_ | Start all (instead of Disconnected) Site-to-Site VPN       |
-|                         |          | connections when VPC VR starts                             |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3803`_ | Bug fix : set restart_required to 0 after restarting       |
-|                         |          | network                                                    |
-+-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3606`_ | VM ingestion                                               |
+| 4.15.0.0                | `#4461`_ | Fix destroying k8s cluster on shared networks              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3836`_ | Bug fix: De-associate IP address if enabling static nat    |
+| 4.15.0.0                | `#4476`_ | Removed sensitive info from UI when volume attach/detach   |
 |                         |          | fails                                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3807`_ | Enhancement: Allow creating network with duplicate name    |
+| 4.15.0.0                | `#4078`_ | Cleanup download urls when SSVM destroyed                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3818`_ | Display numeric value in exception instead of variable     |
-|                         |          | name                                                       |
+| 4.15.0.0                | `#4428`_ | Moved dedicated hosts to the end of the resultset when     |
+|                         |          | selecting an e…                                            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3791`_ | server: fix checking disk offering access for snapshot     |
-|                         |          | volume                                                     |
+| 4.15.0.0                | `#4475`_ | Fix: Data migration                                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3832`_ | ui bug fix: cannot assign vms to internal lb in VPC        |
+| 4.15.0.0                | `#4452`_ | Consider other conditions while listing templates with id  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3855`_ | kvm: Fix router migration issue when router has            |
-|                         |          | control/public nics onother physical network than guest    |
+| 4.15.0.0                | `#4446`_ | Check all mgt server connectivity                          |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3383`_ | template: copy md5 mismatch                                |
+| 4.15.0.0                | `#4469`_ | Fix: Listing projects comprising of only the user's on     |
+|                         |          | listAll=true                                               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3819`_ | Clean up inactive iscsi sessions when VMs get moved due to |
-|                         |          | crashes                                                    |
+| 4.15.0.0                | `#4464`_ | Fix IndexOutOfBoundsException when creating basic network  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3575`_ | Health check feature for virtual router                    |
+| 4.15.0.0                | `#4289`_ | default teardown methods with reversed() handling          |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3275`_ | [CLOUDSTACK-10408] Fix String.replaceAll() to replace()    |
-|                         |          | for bet…                                                   |
+| 4.15.0.0                | `#4465`_ | fix login issue post upgrade                               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3604`_ | Fix Policy Based Routing for private gateway static routes |
+| 4.15.0.0                | `#4456`_ | Returning nic details in KubernetesClusterResponse         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3760`_ | New feature: Resource count (CPU/RAM) take only running    |
-|                         |          | vms into calculation                                       |
+| 4.15.0.0                | `#4418`_ | Create Event in case of OOBM failure                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3803`_ | Bug fix : set restart_required to 0 after restarting       |
-|                         |          | network                                                    |
+| 4.15.0.0                | `#4327`_ | Re-enable IP address usage hiding                          |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3840`_ | Fix listing management server by parameters                |
+| 4.15.0.0                | `#4437`_ | [Bug fix] VMware: Fix for SSVM recreation on deployasis    |
+|                         |          | systemVM templates                                         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3834`_ | Fix: The metrics view API response is not super-set of     |
-|                         |          | resources response keys                                    |
+| 4.15.0.0                | `#4442`_ | Preventing port 53 being added as lb rule when dns service |
+|                         |          | is availab…                                                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3848`_ | vr: fix vr in unknown state (more)                         |
+| 4.15.0.0                | `#4439`_ | Added compress option to dnsmasq log files                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3726`_ | vrouter: reload haproxy when cfg file is updated           |
+| 4.15.0.0                | `#4430`_ | FIX issue in VR if remote access vpn is enabled            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3846`_ | Fix for "Impossible to edit domain settings in UI"         |
+| 4.15.0.0                | `#4440`_ | fix pbm url download                                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3845`_ | travis: use https based maven repo mirror                  |
+| 4.15.0.0                | `#4408`_ | Hiding system reserved IP addresses                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3835`_ | Update Docker README file                                  |
+| 4.15.0.0                | `#4341`_ | Allow to configure root disk size via Service Offering     |
+|                         |          | (diskoffering of type Service).                            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3813`_ | kvm-local-pool-trailing-slash                              |
+| 4.15.0.0                | `#4388`_ | fix NPE in volumes statistics                              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3761`_ | [FIX] [BACKPORT] [4.13] Rethrow takeVMSnapshot() exception |
+| 4.15.0.0                | `#4435`_ | server: fix format error with memorywithoverprovisioning   |
+|                         |          | in list hosts response                                     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3758`_ | server: Fix NPE while update displayvm on vm with dynamic  |
+| 4.15.0.0                | `#4177`_ | Prevent deploying IPv6 network if Zone has no IPv6 DNS     |
+|                         |          | configured                                                 |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4429`_ | FIX s2svpn connection stuck on Pending state               |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4359`_ | Failed to update host password if username/password is not |
+|                         |          | saved in db                                                |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4426`_ | DB: fix wrong category id of guest os 'Other PV            |
+|                         |          | Virtio-SCSI (64-bit)'                                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4432`_ | Unable to create snapshot from vm snapshot                 |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4144`_ | Fix Usage failed to get pid                                |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#3945`_ | server: update template to another template type           |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4363`_ | Ability to put a server in Down state to maintenance       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4417`_ | Modify alter view to drop/create view                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4414`_ | Adding public ip to listKubernetesClusterResponse          |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4367`_ | Remove cpu core from op_host_capacity when host is deleted |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4427`_ | packaging/deb: Include cloudstack-guest-tool into          |
+|                         |          | cloudstack-agent DEB package                               |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4420`_ | Including instance details in KubernetesClusterResponse    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4415`_ | CKS : More log changes from uuid to name                   |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4307`_ | [VMware] vSphere advanced capabilities and Full OVF        |
+|                         |          | properties support                                         |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4375`_ | Fixing count for findHostsForMigration                     |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#2206`_ | [CLOUDSTACK-10020] Changes to make marvin work with        |
+|                         |          | projects and VPCs                                          |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4409`_ | Enhance UpdateDiskOfferingCmd                              |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4413`_ | systemvm: fix proc.find in CsProcess.py                    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4360`_ | server: Update use_bytes of storage pools                  |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4193`_ | Fix usage record count                                     |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4411`_ | Display Kubernetes cluster name instead of uuid            |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4412`_ | Validating type parameter and including all types          |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#67`_   | CLOUDSTACK-8157: Add absolute schema references to support |
+|                         |          | MySQL 5.6 better                                           |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#3946`_ | server: add global configuration for default router        |
 |                         |          | service offering                                           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3728`_ | server: double check host capacity when start/migrate a vm |
+| 4.15.0.0                | `#4387`_ | Fix JsonSyntaxException when creating API command response |
+|                         |          | #4355                                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3727`_ | server: Capacity check should take vms in Migrating state  |
-|                         |          | into calculation                                           |
+| 4.15.0.0                | `#4407`_ | packaging: enable Parallel Collector GC for management     |
+|                         |          | server                                                     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3477`_ | RvR: Set up metadata/password/dhcp server on gateway IP    |
-|                         |          | instead of guest IP in RVR                                 |
+| 4.15.0.0                | `#4395`_ | support for data migration of incremental snaps on xen     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3821`_ | Incorrect param name caused global setting test to fail    |
+| 4.15.0.0                | `#4194`_ | enable update tags on disk offerings                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3825`_ | fixed inconsistency of IP on VR when VR is destroyed and   |
-|                         |          | recrea…                                                    |
+| 4.15.0.0                | `#4251`_ | Handle with VM snapshot events                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3759`_ | server: fix resource count error when upgrade a vm         |
+| 4.15.0.0                | `#4405`_ | Re-add affinity group                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3822`_ | set TCP as default protocol in lb list                     |
+| 4.15.0.0                | `#4377`_ | server: fix issue that vm guest os type is reset after     |
+|                         |          | updatetemplate                                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3694`_ | Ldap fixes                                                 |
+| 4.15.0.0                | `#4381`_ | kvm: fix wrong VM CPU usage                                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3799`_ | Update message when keys are NOT being injected            |
+| 4.15.0.0                | `#4228`_ | Dont add host back after agent service restart             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3806`_ | python/c++ formatting in java corrected                    |
+| 4.15.0.0                | `#4348`_ | vmware: use hotPlugMemoryIncrementSize only for valid      |
+|                         |          | value                                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3814`_ | Add missing HA config keys (#3776)                         |
+| 4.15.0.0                | `#4404`_ | scalekubernetesclustercmd: Making id a required field [NPE |
+|                         |          | Fix]                                                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3350`_ | Get Diagnostics: Download logs and diagnostics data from   |
-|                         |          | SSVM, CPVM, Router                                         |
+| 4.15.0.0                | `#4383`_ | Host is counted twice if it has multiple host tags in      |
+|                         |          | Prometheus exporter                                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3795`_ | Agent lb on svm                                            |
+| 4.15.0.0                | `#4382`_ | debian/control: add uuid-runtime to cloudstack-common,     |
+|                         |          | ufw/apparmor to cloudstack-agent                           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3776`_ | Add missing HA config keys                                 |
+| 4.15.0.0                | `#4379`_ | Add global configuration for max cpu/ram in service        |
+|                         |          | offerings                                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3659`_ | Fix typo: the past tense of shutdown is shutdown, not      |
-|                         |          | shutdowned                                                 |
+| 4.15.0.0                | `#4373`_ | Handles creation /var/run/cloud folder for creation of     |
+|                         |          | lock file while modifyvxlan.sh script is run               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3800`_ | Revert "Extract systemvm.iso using bsdtar (#3536)"         |
+| 4.15.0.0                | `#4366`_ | Consider maintenance mode as offline for prometheus stats  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3510`_ | Allow additional configuration metadata to VMs             |
+| 4.15.0.0                | `#4365`_ | Export dedicated host stats to prometheus                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3736`_ | Add protocol number support for security group rules       |
+| 4.15.0.0                | `#4397`_ | List VMs by Security Group & HA                            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3778`_ | Endless settings on templates and instances                |
+| 4.15.0.0                | `#4376`_ | server: Fix some cpuspeed issues while create service      |
+|                         |          | offering                                                   |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4374`_ | Fixing searchAndCount searchAndDistinctCount when sc is    |
+|                         |          | null                                                       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4389`_ | Fixed vm-templates not being removed from primary storage  |
+|                         |          | with storag…                                               |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4271`_ | hypervisor: Add Citrix Hypervisor 8x product name support  |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4321`_ | VMware: match hardware version for worker VM when taking a |
+|                         |          | snapshot                                                   |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4354`_ | createaccountcmd: Improving account param description      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4352`_ | Retry redfish requests                                     |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4269`_ | cks: assorted fixes, test refactoring                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4338`_ | server: check guest os preference of last host when start  |
+|                         |          | a vm                                                       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4345`_ | Binding listening socket to all address for remote debug   |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4340`_ | Changing test_pvlan vlan id to prevent conflict with smoke |
+|                         |          | tests env config                                           |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4190`_ | Broadcast URI not set to vxlan, but vlan (Fix #3040)       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4328`_ | vmware: search unmanaged instances using hypervisor name   |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4336`_ | vmware: while plugging in nics get existing sorted nic     |
+|                         |          | devices                                                    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4305`_ | Changing dependency from python3-distutils to              |
+|                         |          | python3-distutils-extra                                    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4335`_ | agent: Compare indirect agent lb algorithm when cloudstack |
+|                         |          | agent conn…                                                |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4319`_ | Fix "data-server" dns entry in /etc/hosts after a new      |
+|                         |          | deployment                                                 |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4303`_ | Ubuntu 20.04: Fix systemvm cannot start up                 |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4239`_ | Disabling managing firewall - cloudstack-setup-management  |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4323`_ | systemvm: Update novnc                                     |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4319`_ | Fix "data-server" dns entry in /etc/hosts after a new      |
+|                         |          | deployment                                                 |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4331`_ | change upgrade path to 4.14 (from 4.13) and intensify      |
+|                         |          | check                                                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4333`_ | Minor message update                                       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4294`_ | Create template from detached data-disks on VMWare         |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4316`_ | Handle listProjects API to list projects with user as      |
+|                         |          | members when listAll=true                                  |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4309`_ | cks: fix logging exception on create cluster               |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4326`_ | ui: call logout before login to clear old sessionkey       |
+|                         |          | cookies                                                    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4315`_ | Adding acl name to listNetworkAcl, listNetwork,            |
+|                         |          | listPrivateGateway, listVpcs responses                     |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4053`_ | Secondary Storage Usage Improvements                       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4312`_ | Increase wait time before running the ssvm health check    |
+|                         |          | script on SSVM reboot                                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4320`_ | Change Global setting type for allow.user.create.projects  |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4317`_ | Display acl name in listNetworks response                  |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4297`_ | Incorrect md5sums for systemVM templates results in        |
+|                         |          | failure to download templates to other image stores        |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4306`_ | Ubuntu 20.04: Fix issue while build package on ubuntu      |
+|                         |          | 20.04                                                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4301`_ | Ubuntu 20.04: restart libvirtd instead of libvirt-bin      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4291`_ | Manage influxDB Batches avoiding OutOfMemory Exception     |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4284`_ | Fixed delayed power state update after vm shutdown         |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4279`_ | Avoid Null pointer at DomainChecker and enhance            |
+|                         |          | AssignVMCmd                                                |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4020`_ | server: move UpdateDefaultNic to vm work job queue         |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4258`_ | List networks using networkofferingid                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#3996`_ | UI: Hide cpuspeed for custom constrained offering          |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#3902`_ | vrouter: Save PlaceHolder nic for VR if network does not   |
+|                         |          | have source nat                                            |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4288`_ | client: explicitly define SslContextFactory::Server for    |
+|                         |          | https                                                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4287`_ | Update Java Rados from v0.5.0 to v0.6.0                    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4266`_ | Adding os type id to the usage record response for virtual |
+|                         |          | machines                                                   |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4264`_ | Changed test failure to warning                            |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4272`_ | Fixed rolling restart on VPC network                       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4274`_ | engine: honour bypass VLAN id/range for L2 networks        |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4278`_ | Usage-server update message improvement                    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4219`_ | iscsi session cleanup now configurable, filters iscsi      |
+|                         |          | partitions                                                 |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4040`_ | [KVM] Enable PVLAN support on L2 networks                  |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4275`_ | Display hypervisor type for VM snapshot                    |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4180`_ | Added nfs minor version support                            |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4068`_ | Adding Centos8, Ubuntu 20.04, XCPNG8.1 Support             |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4268`_ | Prevent NullPointerException on GenericDaoBase             |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4262`_ | fix test failure                                           |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4207`_ | Human readable sizes in logs                               |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4254`_ | Name public network appropriately to avoid conflicts       |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4128`_ | Role based users in Projects                               |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4213`_ | Search vm snapshots using tags                             |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4255`_ | Prevent null pointer on listPublicIpAddress cmd            |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4256`_ | Fix comparison using nullable objects                      |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4260`_ | cks: fix for null hypervisor type                          |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4016`_ | Fixed private gateway can't be deleted                     |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4253`_ | Fix sed command failure in Mac OS.                         |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4249`_ | Host SSVM Debian ISO on download.cloudstack.org            |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4243`_ | Update SystemVM debian iso from 10.4.0 to 10.5.0           |
++-------------------------+----------+------------------------------------------------------------+
+| 4.15.0.0                | `#4019`_ | server: Move restoreVM to vm work job queue                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3796`_ | Revert "Simulator: Better VR Redundant Status Behaviour"   |
+| 4.15.0.0                | `#4165`_ | Allow renaming cluster, host, and storage                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3743`_ | only update powerstate if sure it is the latest            |
+| 4.15.0.0                | `#4220`_ | Fix cpuallocated value in findHostsForMIgration api        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3536`_ | Extract systemvm.iso using bsdtar                          |
+| 4.15.0.0                | `#4225`_ | vmware: volume utilisation is always zero                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3313`_ | Simulator: Better VR Redundant Status Behaviour            |
+| 4.15.0.0                | `#4000`_ | vm: Reset deviceId to fix missing nic with vm              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3682`_ | ui: fix migrate host form no host popup                    |
+| 4.15.0.0                | `#4231`_ | kvm/ceph: Only if a port number has been specified define  |
+|                         |          | in the XML                                                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3658`_ | client: fix for jetty session timeout                      |
+| 4.15.0.0                | `#4116`_ | cks: fix template, deployment issues                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3662`_ | Increase DHCP lease time to infinite                       |
+| 4.15.0.0                | `#3952`_ | vrouter: remove a POSTROUTING rule for port forwarding in  |
+|                         |          | VPC router                                                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3793`_ | ui: fix for truncated name for project accounts            |
+| 4.15.0.0                | `#4175`_ | Redfish Client & Redfish OOBM Driver                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3597`_ | kvm: Logrotate should not touch agent.log                  |
+| 4.15.0.0                | `#4035`_ | Document how to pass CIDRs lists API calls                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3721`_ | network: cleanup dhcp/dns entries while remove a nic from  |
-|                         |          | vm                                                         |
+| 4.15.0.0                | `#4214`_ | Bug fixes for primate                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3790`_ | Bug fix: Dont display empty item in free ip list           |
+| 4.15.0.0                | `#4226`_ | Removed check on SSLEngine client mode                     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3715`_ | break session only on illegal origin                       |
+| 4.15.0.0                | `#4188`_ | Fix snapshots garbage collection                           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3775`_ | New feature: Acquire specific public IP for network        |
+| 4.15.0.0                | `#4138`_ | Fixed incorrect error message on invalid template type     |
+|                         |          | download                                                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3755`_ | Added zone check for attach iso                            |
+| 4.15.0.0                | `#4156`_ | Fixed removal of hosts from certsmap when running          |
+|                         |          | certificate auto-renew                                     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3782`_ | 4.13                                                       |
+| 4.15.0.0                | `#4172`_ | [VMware] Support to attach more than 15 data disks in      |
+|                         |          | VMware VM                                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3729`_ | config: add isdynamic flag in configuration response       |
+| 4.15.0.0                | `#4196`_ | VMware: Guest OS Mappings fix                              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3733`_ | filter hosts to query on zone wide storage                 |
+| 4.15.0.0                | `#4176`_ | server: Purge all cookies on logout, set /client path on   |
+|                         |          | login                                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3747`_ | convert protocal names to be found as labels               |
+| 4.15.0.0                | `#4202`_ | server: don't export B&R APIs if feature is not enabled    |
+|                         |          | globally                                                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3754`_ | Once again allow a VM to be on multiple networks from VPCs |
+| 4.15.0.0                | `#3979`_ | Limit API from trying to start a VM that is already        |
+|                         |          | running                                                    |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3767`_ | create template from snapshot regression (partly reverted) |
+| 4.15.0.0                | `#4174`_ | Set prometheus.exporter.enable as not dynamic              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3781`_ | Honour promiscuous mode from networkOffering (#3765)       |
+| 4.15.0.0                | `#4117`_ | [VMware] Explicitly controlling VM hardware version        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3765`_ | Honour promiscuous mode from networkOffering               |
+| 4.15.0.0                | `#4071`_ | Dynamic roles improvements                                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3772`_ | Revert of the "Revert "Fix virtual template size for       |
-|                         |          | managed storage for KVM / refactor                         |
-|                         |          | cloud-install-sys-tmplt""                                  |
+| 4.15.0.0                | `#4186`_ | Adding pagination for quotaSummary and quotaTariffList     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3425`_ | Better tracking host maintanence and handling of migration |
-|                         |          | jobs                                                       |
+| 4.15.0.0                | `#4001`_ | server: Dedicated hosts should be 'Not Suitable' while     |
+|                         |          | find host for m migration                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3774`_ | Revert "Add missing HA config keys"                        |
+| 4.15.0.0                | `#3976`_ | Enable sending hypervior host name via metadata - VR and   |
+|                         |          | Config Drive                                               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3771`_ | Revert "Fix virtual template size for managed storage for  |
-|                         |          | KVM / refactor cloud-install-sys-tmplt"                    |
+| 4.15.0.0                | `#4103`_ | [VMware] Enable unmanaging guest VMs                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3371`_ | Fix virtual template size for managed storage for KVM /    |
-|                         |          | refactor cloud-install-sys-tmplt                           |
+| 4.15.0.0                | `#4148`_ | server: Do not resize volume of running vm on KVM host if  |
+|                         |          | host is not Up or not Enabled                              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3737`_ | Add missing HA config keys                                 |
+| 4.15.0.0                | `#4171`_ | vr: fix backup router health check                         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3738`_ | Load Average for KVM                                       |
+| 4.15.0.0                | `#4167`_ | Adding missing fields to API responses                     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3769`_ | README: that time of the year!                             |
+| 4.15.0.0                | `#4164`_ | Adding listall to listLdapConfigurations                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3746`_ | Fix OS category for some OS-es added in 4.13               |
+| 4.15.0.0                | `#4154`_ | server: fix for wrong affinity group count                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3615`_ | Handle Ceph/RBD snapshot delete                            |
+| 4.15.0.0                | `#4004`_ | Fixed null pointer and deployment issue on Xenserver with  |
+|                         |          | L2 Guest network with configDrive                          |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3546`_ | [FIX] Rethrow takeVMSnapshot() exception                   |
+| 4.15.0.0                | `#4162`_ | Exception Message rephrasing                               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3474`_ | Enhance VM Statistics to add more detail                   |
+| 4.15.0.0                | `#4132`_ | Fix delete network with no services                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3745`_ | Save SSH.PublicKey into user_vm_details regardless of      |
-|                         |          | password management.                                       |
+| 4.15.0.0                | `#4145`_ | Fixing listVirtualMachinesMetrics to extend ListVMsCmd     |
+|                         |          | instead of ListVMsCmdByAdmin                               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3740`_ | Add support for ecdsa and ed25519 public keys.             |
+| 4.15.0.0                | `#3998`_ | NPE when VM is planned to migrate to other host during     |
+|                         |          | dynamic scaling                                            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3617`_ | [KVM] Agent LB Fix: Connections from disabled KVM host     |
-|                         |          | agents are refused                                         |
+| 4.15.0.0                | `#4085`_ | Fix duplicate user entries for vpn usage                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3669`_ | server: Fix resource count of primary storage/volume       |
-|                         |          | because of Expunged volumes                                |
+| 4.15.0.0                | `#4140`_ | Adding showunique parameter to list templates and isos     |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3723`_ | a conditional to prevent creation of a field               |
+| 4.15.0.0                | `#4007`_ | Restarting all networks that needs a restart in a VPC      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3640`_ | consoleproxy: Enable console for vms in Stopping/Migrating |
-|                         |          | state                                                      |
+| 4.15.0.0                | `#4003`_ | Logging framework to use only log4j                        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3704`_ | utils: use iproute to get default network interface        |
+| 4.15.0.0                | `#4121`_ | server: fix TransactionLegacy DB connection leaks due to   |
+|                         |          | DB switching by B&R thread                                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3703`_ | increase width of field in UI                              |
+| 4.15.0.0                | `#3991`_ | Multiple dynamic VM Scaling APIs can create duplicate      |
+|                         |          | usage events for the same time                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3696`_ | env config for dual zone simulator                         |
+| 4.15.0.0                | `#4070`_ | Update cloud-set-guest-password.in                         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3695`_ | debian: fix symlink issue post install/upgrade             |
+| 4.15.0.0                | `#4130`_ | Fixed null pointer after deleting snapshot, GC and cross   |
+|                         |          | cluster vm migration on XCP-NG                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3701`_ | security_group.py: check cidr unstrictly to accept cidrs   |
-|                         |          | like 1.1.1.1/24                                            |
+| 4.15.0.0                | `#4122`_ | Maximum data volumes limit is picked from "default"        |
+|                         |          | version of hypervisor, instead of actual hypervisor        |
+|                         |          | version                                                    |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3635`_ | server: acquire IPv4 address when add secondary IP to nic  |
-|                         |          | if IP is not specified                                     |
+| 4.15.0.0                | `#3982`_ | Updated 3 error messages to replace the word 'matches'     |
+|                         |          | with 'match'                                               |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3636`_ | kvm: fix issue that network rules for secondary IPs are    |
-|                         |          | not applied                                                |
+| 4.15.0.0                | `#4073`_ | Display network name for IP in shared networks             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3653`_ | Fix VR creation issue while creating VM on shared network  |
-|                         |          | using PVLAN                                                |
+| 4.15.0.0                | `#4075`_ | Search VR using redundant state                            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3630`_ | New BuildRequires for CentOS 7: python-setuptools          |
+| 4.15.0.0                | `#3949`_ | Fix: catch CloudRuntimeException in                        |
+|                         |          | LibvirtGetVolumeStatsCommandWrapper.java                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3650`_ | Add support for vSphere Web SDK 6.7 installation in        |
-|                         |          | install-non-oss.sh                                         |
+| 4.15.0.0                | `#3955`_ | docker: upgrade to ubuntu 18.04 and fix some issues        |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3678`_ | vpc: fix acl rule with protocol number is not applied      |
-|                         |          | correctly in vpc vr                                        |
+| 4.15.0.0                | `#3980`_ | Fix String.format unused/misused arguments                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3632`_ | add class cleanup method                                   |
+| 4.15.0.0                | `#4048`_ | Update DpdkDriverImpl.java to support DPDK trunk           |
+|                         |          | interfaces                                                 |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3682`_ | ui: fix migrate host form no host popup                    |
+| 4.15.0.0                | `#4083`_ | Allow set IPv6 when deploying advanced network  Zone with  |
+|                         |          | SG via UI                                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3605`_ | fix issue #3590 'Revert Ceph/RBD Snapshot'                 |
+| 4.15.0.0                | `#4142`_ | Invalid character encountered in file ui/l10n/pt_BR.js at  |
+|                         |          | line 1134 for encoding UTF-8.                              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3668`_ | storage: don't select an SSVM that is removed              |
+| 4.15.0.0                | `#4109`_ | add support for XCP-ng 7/8 to create it's heartbeat LVM    |
+|                         |          | properly                                                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3612`_ | systemvm: for ip route show command don't use the throw    |
-|                         |          | command                                                    |
+| 4.15.0.0                | `#4077`_ | Disable searching by instance name for customers           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3616`_ | Reduce verbosity of Async Job Manager log messages         |
+| 4.15.0.0                | `#4021`_ | Boot into hardware setup menu on Vmware                    |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3644`_ | IoT/ARM64 support: allow cloudstack-agent on Raspberry Pi  |
-|                         |          | 4 (armv8) to use kvm acceleration                          |
+| 4.15.0.0                | `#3965`_ | server: Honor vm.destroy.forcestop when expunge a vm       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3666`_ | snapshot failure diagnostics unhidden                      |
+| 4.15.0.0                | `#4104`_ | Debian10 support                                           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3623`_ | kvm: Use 'ip' instead of 'brctl'                           |
+| 4.15.0.0                | `#4017`_ | [UI] Update ISO permissions                                |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3620`_ | Small additional NuageVsp cleanups (#3146)                 |
+| 4.15.0.0                | `#4079`_ | Fixed HA migrated storage error                            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3658`_ | client: fix for jetty session timeout                      |
+| 4.15.0.0                | `#4046`_ | Display image store disk size used and total disk size     |
+|                         |          | stats                                                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3665`_ | ignore patches and unzipped logs                           |
+| 4.15.0.0                | `#4013`_ | Allow IMG extension for QCOW2 format                       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3662`_ | Increase DHCP lease time to infinite                       |
+| 4.15.0.0                | `#4062`_ | [VMware] Cannot migrate VM on PVLAN shared network         |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3641`_ | security_group.py: fix NameError: name 'd' is not defined  |
+| 4.15.0.0                | `#4119`_ | kvm: bump jna version to latest                            |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3648`_ | Security Group: limit returns in get_bridge_physdev to 1   |
+| 4.15.0.0                | `#4126`_ | Enhance KVM running VM snapshot exception log              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3525`_ | NioServer: retain links by address string to minimize      |
-|                         |          | resource leak                                              |
+| 4.15.0.0                | `#4123`_ | Improved kvmvmactivitycheck.sh output                      |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3627`_ | server: Do NOT cleanup dhcp and dns when stop a vm         |
+| 4.15.0.0                | `#4065`_ | Enable revocation checking for uploaded certificates       |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3589`_ | kvm/security_group: Make Security Group Python 3           |
-|                         |          | compatible                                                 |
+| 4.15.0.0                | `#4124`_ | Missing python3 libvirt bindings                           |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3608`_ | server: Cleanup dhcp and dns entries only on expunging VM  |
+| 4.15.0.0                | `#3794`_ | create Volume Access Groups per cluster instead of         |
+|                         |          | CloudStack-RandomUUID()                                    |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3607`_ | allocator: in case of null guest OS don't fail             |
-|                         |          | prioritisation completely                                  |
+| 4.15.0.0                | `#4100`_ | RabbitMQ log enhancement                                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3538`_ | Refactoring to remove duplicate code (by Frank/Nuage)      |
+| 4.15.0.0                | `#3921`_ | Updated vmware virtual hardware version in                 |
+|                         |          | systemvmtemplate build script                              |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3597`_ | kvm: Logrotate should not touch agent.log                  |
+| 4.15.0.0                | `#4110`_ | cleanup of redundant check for sameOwner                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3591`_ | Deprecate EL6 and Add 4.13-4.14 Upgrade Path               |
+| 4.15.0.0                | `#4092`_ | engine/schema: add empty DB upgrade path from 4.14.0.0 to  |
+|                         |          | 4.15.0.0                                                   |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3574`_ | `service is-active` output check for "failed"              |
+| 4.15.0.0                | `#4097`_ | Adding novnc license exclusion                             |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3519`_ | kvm/cloudstack-guest-tool: Tool to query Qemu Guest Agent  |
+| 4.15.0.0                | `#3967`_ | noVNC console integration                                  |
 +-------------------------+----------+------------------------------------------------------------+
-| 4.14.0.0                | `#3582`_ | systemvmtemplate: Fix Debian 9 iso url                     |
+| 4.15.0.0                | `#4087`_ | python format                                              |
 +-------------------------+----------+------------------------------------------------------------+
 
-216 Issues listed
+256 Issues listed
 
-.. _`#4064`: https://github.com/apache/cloudstack/pull/4064
-.. _`#4057`: https://github.com/apache/cloudstack/pull/4057
-.. _`#3992`: https://github.com/apache/cloudstack/pull/3992
-.. _`#4055`: https://github.com/apache/cloudstack/pull/4055
-.. _`#4042`: https://github.com/apache/cloudstack/pull/4042
-.. _`#4043`: https://github.com/apache/cloudstack/pull/4043
-.. _`#4029`: https://github.com/apache/cloudstack/pull/4029
-.. _`#4033`: https://github.com/apache/cloudstack/pull/4033
-.. _`#4023`: https://github.com/apache/cloudstack/pull/4023
-.. _`#3969`: https://github.com/apache/cloudstack/pull/3969
-.. _`#4025`: https://github.com/apache/cloudstack/pull/4025
-.. _`#4014`: https://github.com/apache/cloudstack/pull/4014
-.. _`#4002`: https://github.com/apache/cloudstack/pull/4002
-.. _`#3984`: https://github.com/apache/cloudstack/pull/3984
-.. _`#3999`: https://github.com/apache/cloudstack/pull/3999
-.. _`#4008`: https://github.com/apache/cloudstack/pull/4008
-.. _`#3988`: https://github.com/apache/cloudstack/pull/3988
-.. _`#4005`: https://github.com/apache/cloudstack/pull/4005
-.. _`#3995`: https://github.com/apache/cloudstack/pull/3995
-.. _`#3993`: https://github.com/apache/cloudstack/pull/3993
-.. _`#3977`: https://github.com/apache/cloudstack/pull/3977
-.. _`#3973`: https://github.com/apache/cloudstack/pull/3973
-.. _`#3956`: https://github.com/apache/cloudstack/pull/3956
-.. _`#3985`: https://github.com/apache/cloudstack/pull/3985
-.. _`#3989`: https://github.com/apache/cloudstack/pull/3989
-.. _`#3972`: https://github.com/apache/cloudstack/pull/3972
-.. _`#3971`: https://github.com/apache/cloudstack/pull/3971
-.. _`#3587`: https://github.com/apache/cloudstack/pull/3587
-.. _`#3839`: https://github.com/apache/cloudstack/pull/3839
-.. _`#3638`: https://github.com/apache/cloudstack/pull/3638
-.. _`#3960`: https://github.com/apache/cloudstack/pull/3960
-.. _`#3932`: https://github.com/apache/cloudstack/pull/3932
-.. _`#3681`: https://github.com/apache/cloudstack/pull/3681
-.. _`#3962`: https://github.com/apache/cloudstack/pull/3962
-.. _`#3963`: https://github.com/apache/cloudstack/pull/3963
-.. _`#3610`: https://github.com/apache/cloudstack/pull/3610
-.. _`#3948`: https://github.com/apache/cloudstack/pull/3948
-.. _`#3953`: https://github.com/apache/cloudstack/pull/3953
-.. _`#3925`: https://github.com/apache/cloudstack/pull/3925
-.. _`#2446`: https://github.com/apache/cloudstack/pull/2446
-.. _`#3657`: https://github.com/apache/cloudstack/pull/3657
-.. _`#3943`: https://github.com/apache/cloudstack/pull/3943
-.. _`#3940`: https://github.com/apache/cloudstack/pull/3940
-.. _`#3828`: https://github.com/apache/cloudstack/pull/3828
-.. _`#3651`: https://github.com/apache/cloudstack/pull/3651
-.. _`#3947`: https://github.com/apache/cloudstack/pull/3947
-.. _`#3935`: https://github.com/apache/cloudstack/pull/3935
-.. _`#3919`: https://github.com/apache/cloudstack/pull/3919
-.. _`#3680`: https://github.com/apache/cloudstack/pull/3680
-.. _`#3862`: https://github.com/apache/cloudstack/pull/3862
-.. _`#3924`: https://github.com/apache/cloudstack/pull/3924
-.. _`#3928`: https://github.com/apache/cloudstack/pull/3928
-.. _`#3911`: https://github.com/apache/cloudstack/pull/3911
-.. _`#3930`: https://github.com/apache/cloudstack/pull/3930
-.. _`#3927`: https://github.com/apache/cloudstack/pull/3927
-.. _`#3553`: https://github.com/apache/cloudstack/pull/3553
-.. _`#3901`: https://github.com/apache/cloudstack/pull/3901
-.. _`#3847`: https://github.com/apache/cloudstack/pull/3847
-.. _`#3898`: https://github.com/apache/cloudstack/pull/3898
-.. _`#3907`: https://github.com/apache/cloudstack/pull/3907
-.. _`#3916`: https://github.com/apache/cloudstack/pull/3916
-.. _`#3913`: https://github.com/apache/cloudstack/pull/3913
-.. _`#3904`: https://github.com/apache/cloudstack/pull/3904
-.. _`#3903`: https://github.com/apache/cloudstack/pull/3903
-.. _`#3894`: https://github.com/apache/cloudstack/pull/3894
-.. _`#3731`: https://github.com/apache/cloudstack/pull/3731
-.. _`#3899`: https://github.com/apache/cloudstack/pull/3899
-.. _`#3905`: https://github.com/apache/cloudstack/pull/3905
-.. _`#3639`: https://github.com/apache/cloudstack/pull/3639
-.. _`#3491`: https://github.com/apache/cloudstack/pull/3491
-.. _`#3879`: https://github.com/apache/cloudstack/pull/3879
-.. _`#3739`: https://github.com/apache/cloudstack/pull/3739
-.. _`#3884`: https://github.com/apache/cloudstack/pull/3884
-.. _`#3882`: https://github.com/apache/cloudstack/pull/3882
-.. _`#3864`: https://github.com/apache/cloudstack/pull/3864
-.. _`#3880`: https://github.com/apache/cloudstack/pull/3880
-.. _`#3871`: https://github.com/apache/cloudstack/pull/3871
-.. _`#3873`: https://github.com/apache/cloudstack/pull/3873
-.. _`#3877`: https://github.com/apache/cloudstack/pull/3877
-.. _`#3601`: https://github.com/apache/cloudstack/pull/3601
-.. _`#3876`: https://github.com/apache/cloudstack/pull/3876
-.. _`#3732`: https://github.com/apache/cloudstack/pull/3732
-.. _`#3870`: https://github.com/apache/cloudstack/pull/3870
-.. _`#3688`: https://github.com/apache/cloudstack/pull/3688
-.. _`#3854`: https://github.com/apache/cloudstack/pull/3854
-.. _`#3865`: https://github.com/apache/cloudstack/pull/3865
-.. _`#3869`: https://github.com/apache/cloudstack/pull/3869
-.. _`#3805`: https://github.com/apache/cloudstack/pull/3805
-.. _`#3844`: https://github.com/apache/cloudstack/pull/3844
-.. _`#3865`: https://github.com/apache/cloudstack/pull/3865
-.. _`#3857`: https://github.com/apache/cloudstack/pull/3857
-.. _`#3851`: https://github.com/apache/cloudstack/pull/3851
-.. _`#3867`: https://github.com/apache/cloudstack/pull/3867
-.. _`#3861`: https://github.com/apache/cloudstack/pull/3861
-.. _`#3863`: https://github.com/apache/cloudstack/pull/3863
-.. _`#3803`: https://github.com/apache/cloudstack/pull/3803
-.. _`#3606`: https://github.com/apache/cloudstack/pull/3606
-.. _`#3836`: https://github.com/apache/cloudstack/pull/3836
-.. _`#3807`: https://github.com/apache/cloudstack/pull/3807
-.. _`#3818`: https://github.com/apache/cloudstack/pull/3818
-.. _`#3791`: https://github.com/apache/cloudstack/pull/3791
-.. _`#3832`: https://github.com/apache/cloudstack/pull/3832
-.. _`#3855`: https://github.com/apache/cloudstack/pull/3855
-.. _`#3383`: https://github.com/apache/cloudstack/pull/3383
-.. _`#3819`: https://github.com/apache/cloudstack/pull/3819
-.. _`#3575`: https://github.com/apache/cloudstack/pull/3575
-.. _`#3275`: https://github.com/apache/cloudstack/pull/3275
-.. _`#3604`: https://github.com/apache/cloudstack/pull/3604
-.. _`#3760`: https://github.com/apache/cloudstack/pull/3760
-.. _`#3803`: https://github.com/apache/cloudstack/pull/3803
-.. _`#3840`: https://github.com/apache/cloudstack/pull/3840
-.. _`#3834`: https://github.com/apache/cloudstack/pull/3834
-.. _`#3848`: https://github.com/apache/cloudstack/pull/3848
-.. _`#3726`: https://github.com/apache/cloudstack/pull/3726
-.. _`#3846`: https://github.com/apache/cloudstack/pull/3846
-.. _`#3845`: https://github.com/apache/cloudstack/pull/3845
-.. _`#3835`: https://github.com/apache/cloudstack/pull/3835
-.. _`#3813`: https://github.com/apache/cloudstack/pull/3813
-.. _`#3761`: https://github.com/apache/cloudstack/pull/3761
-.. _`#3758`: https://github.com/apache/cloudstack/pull/3758
-.. _`#3728`: https://github.com/apache/cloudstack/pull/3728
-.. _`#3727`: https://github.com/apache/cloudstack/pull/3727
-.. _`#3477`: https://github.com/apache/cloudstack/pull/3477
-.. _`#3821`: https://github.com/apache/cloudstack/pull/3821
-.. _`#3825`: https://github.com/apache/cloudstack/pull/3825
-.. _`#3759`: https://github.com/apache/cloudstack/pull/3759
-.. _`#3822`: https://github.com/apache/cloudstack/pull/3822
-.. _`#3694`: https://github.com/apache/cloudstack/pull/3694
-.. _`#3799`: https://github.com/apache/cloudstack/pull/3799
-.. _`#3806`: https://github.com/apache/cloudstack/pull/3806
-.. _`#3814`: https://github.com/apache/cloudstack/pull/3814
-.. _`#3350`: https://github.com/apache/cloudstack/pull/3350
-.. _`#3795`: https://github.com/apache/cloudstack/pull/3795
-.. _`#3776`: https://github.com/apache/cloudstack/pull/3776
-.. _`#3659`: https://github.com/apache/cloudstack/pull/3659
-.. _`#3800`: https://github.com/apache/cloudstack/pull/3800
-.. _`#3510`: https://github.com/apache/cloudstack/pull/3510
-.. _`#3736`: https://github.com/apache/cloudstack/pull/3736
-.. _`#3778`: https://github.com/apache/cloudstack/pull/3778
-.. _`#3796`: https://github.com/apache/cloudstack/pull/3796
-.. _`#3743`: https://github.com/apache/cloudstack/pull/3743
-.. _`#3536`: https://github.com/apache/cloudstack/pull/3536
-.. _`#3313`: https://github.com/apache/cloudstack/pull/3313
-.. _`#3682`: https://github.com/apache/cloudstack/pull/3682
-.. _`#3658`: https://github.com/apache/cloudstack/pull/3658
-.. _`#3662`: https://github.com/apache/cloudstack/pull/3662
-.. _`#3793`: https://github.com/apache/cloudstack/pull/3793
-.. _`#3597`: https://github.com/apache/cloudstack/pull/3597
-.. _`#3721`: https://github.com/apache/cloudstack/pull/3721
-.. _`#3790`: https://github.com/apache/cloudstack/pull/3790
-.. _`#3715`: https://github.com/apache/cloudstack/pull/3715
-.. _`#3775`: https://github.com/apache/cloudstack/pull/3775
-.. _`#3755`: https://github.com/apache/cloudstack/pull/3755
-.. _`#3782`: https://github.com/apache/cloudstack/pull/3782
-.. _`#3729`: https://github.com/apache/cloudstack/pull/3729
-.. _`#3733`: https://github.com/apache/cloudstack/pull/3733
-.. _`#3747`: https://github.com/apache/cloudstack/pull/3747
-.. _`#3754`: https://github.com/apache/cloudstack/pull/3754
-.. _`#3767`: https://github.com/apache/cloudstack/pull/3767
-.. _`#3781`: https://github.com/apache/cloudstack/pull/3781
-.. _`#3765`: https://github.com/apache/cloudstack/pull/3765
-.. _`#3772`: https://github.com/apache/cloudstack/pull/3772
-.. _`#3425`: https://github.com/apache/cloudstack/pull/3425
-.. _`#3774`: https://github.com/apache/cloudstack/pull/3774
-.. _`#3771`: https://github.com/apache/cloudstack/pull/3771
-.. _`#3371`: https://github.com/apache/cloudstack/pull/3371
-.. _`#3737`: https://github.com/apache/cloudstack/pull/3737
-.. _`#3738`: https://github.com/apache/cloudstack/pull/3738
-.. _`#3769`: https://github.com/apache/cloudstack/pull/3769
-.. _`#3746`: https://github.com/apache/cloudstack/pull/3746
-.. _`#3615`: https://github.com/apache/cloudstack/pull/3615
-.. _`#3546`: https://github.com/apache/cloudstack/pull/3546
-.. _`#3474`: https://github.com/apache/cloudstack/pull/3474
-.. _`#3745`: https://github.com/apache/cloudstack/pull/3745
-.. _`#3740`: https://github.com/apache/cloudstack/pull/3740
-.. _`#3617`: https://github.com/apache/cloudstack/pull/3617
-.. _`#3669`: https://github.com/apache/cloudstack/pull/3669
-.. _`#3723`: https://github.com/apache/cloudstack/pull/3723
-.. _`#3640`: https://github.com/apache/cloudstack/pull/3640
-.. _`#3704`: https://github.com/apache/cloudstack/pull/3704
-.. _`#3703`: https://github.com/apache/cloudstack/pull/3703
-.. _`#3696`: https://github.com/apache/cloudstack/pull/3696
-.. _`#3695`: https://github.com/apache/cloudstack/pull/3695
-.. _`#3701`: https://github.com/apache/cloudstack/pull/3701
-.. _`#3635`: https://github.com/apache/cloudstack/pull/3635
-.. _`#3636`: https://github.com/apache/cloudstack/pull/3636
-.. _`#3653`: https://github.com/apache/cloudstack/pull/3653
-.. _`#3630`: https://github.com/apache/cloudstack/pull/3630
-.. _`#3650`: https://github.com/apache/cloudstack/pull/3650
-.. _`#3678`: https://github.com/apache/cloudstack/pull/3678
-.. _`#3632`: https://github.com/apache/cloudstack/pull/3632
-.. _`#3682`: https://github.com/apache/cloudstack/pull/3682
-.. _`#3605`: https://github.com/apache/cloudstack/pull/3605
-.. _`#3668`: https://github.com/apache/cloudstack/pull/3668
-.. _`#3612`: https://github.com/apache/cloudstack/pull/3612
-.. _`#3616`: https://github.com/apache/cloudstack/pull/3616
-.. _`#3644`: https://github.com/apache/cloudstack/pull/3644
-.. _`#3666`: https://github.com/apache/cloudstack/pull/3666
-.. _`#3623`: https://github.com/apache/cloudstack/pull/3623
-.. _`#3620`: https://github.com/apache/cloudstack/pull/3620
-.. _`#3658`: https://github.com/apache/cloudstack/pull/3658
-.. _`#3665`: https://github.com/apache/cloudstack/pull/3665
-.. _`#3662`: https://github.com/apache/cloudstack/pull/3662
-.. _`#3641`: https://github.com/apache/cloudstack/pull/3641
-.. _`#3648`: https://github.com/apache/cloudstack/pull/3648
-.. _`#3525`: https://github.com/apache/cloudstack/pull/3525
-.. _`#3627`: https://github.com/apache/cloudstack/pull/3627
-.. _`#3589`: https://github.com/apache/cloudstack/pull/3589
-.. _`#3608`: https://github.com/apache/cloudstack/pull/3608
-.. _`#3607`: https://github.com/apache/cloudstack/pull/3607
-.. _`#3538`: https://github.com/apache/cloudstack/pull/3538
-.. _`#3597`: https://github.com/apache/cloudstack/pull/3597
-.. _`#3591`: https://github.com/apache/cloudstack/pull/3591
-.. _`#3574`: https://github.com/apache/cloudstack/pull/3574
-.. _`#3519`: https://github.com/apache/cloudstack/pull/3519
-.. _`#3582`: https://github.com/apache/cloudstack/pull/3582
+.. _`#4568`: https://github.com/apache/cloudstack/pull/4568 
+.. _`#4559`: https://github.com/apache/cloudstack/pull/4559 
+.. _`#4553`: https://github.com/apache/cloudstack/pull/4553 
+.. _`#4555`: https://github.com/apache/cloudstack/pull/4555 
+.. _`#4540`: https://github.com/apache/cloudstack/pull/4540 
+.. _`#4529`: https://github.com/apache/cloudstack/pull/4529 
+.. _`#4522`: https://github.com/apache/cloudstack/pull/4522 
+.. _`#4516`: https://github.com/apache/cloudstack/pull/4516 
+.. _`#4533`: https://github.com/apache/cloudstack/pull/4533 
+.. _`#4536`: https://github.com/apache/cloudstack/pull/4536 
+.. _`#4538`: https://github.com/apache/cloudstack/pull/4538 
+.. _`#4511`: https://github.com/apache/cloudstack/pull/4511 
+.. _`#4530`: https://github.com/apache/cloudstack/pull/4530 
+.. _`#4532`: https://github.com/apache/cloudstack/pull/4532 
+.. _`#4526`: https://github.com/apache/cloudstack/pull/4526 
+.. _`#4527`: https://github.com/apache/cloudstack/pull/4527 
+.. _`#4525`: https://github.com/apache/cloudstack/pull/4525 
+.. _`#4523`: https://github.com/apache/cloudstack/pull/4523 
+.. _`#4497`: https://github.com/apache/cloudstack/pull/4497 
+.. _`#4521`: https://github.com/apache/cloudstack/pull/4521 
+.. _`#4507`: https://github.com/apache/cloudstack/pull/4507 
+.. _`#4515`: https://github.com/apache/cloudstack/pull/4515 
+.. _`#4518`: https://github.com/apache/cloudstack/pull/4518 
+.. _`#4510`: https://github.com/apache/cloudstack/pull/4510 
+.. _`#4501`: https://github.com/apache/cloudstack/pull/4501 
+.. _`#4505`: https://github.com/apache/cloudstack/pull/4505 
+.. _`#4499`: https://github.com/apache/cloudstack/pull/4499 
+.. _`#4496`: https://github.com/apache/cloudstack/pull/4496 
+.. _`#4495`: https://github.com/apache/cloudstack/pull/4495 
+.. _`#4500`: https://github.com/apache/cloudstack/pull/4500 
+.. _`#4494`: https://github.com/apache/cloudstack/pull/4494 
+.. _`#4489`: https://github.com/apache/cloudstack/pull/4489 
+.. _`#4361`: https://github.com/apache/cloudstack/pull/4361 
+.. _`#4486`: https://github.com/apache/cloudstack/pull/4486 
+.. _`#4483`: https://github.com/apache/cloudstack/pull/4483 
+.. _`#4425`: https://github.com/apache/cloudstack/pull/4425 
+.. _`#4392`: https://github.com/apache/cloudstack/pull/4392 
+.. _`#4467`: https://github.com/apache/cloudstack/pull/4467 
+.. _`#4480`: https://github.com/apache/cloudstack/pull/4480 
+.. _`#4478`: https://github.com/apache/cloudstack/pull/4478 
+.. _`#4466`: https://github.com/apache/cloudstack/pull/4466 
+.. _`#4458`: https://github.com/apache/cloudstack/pull/4458 
+.. _`#4487`: https://github.com/apache/cloudstack/pull/4487 
+.. _`#4459`: https://github.com/apache/cloudstack/pull/4459 
+.. _`#4485`: https://github.com/apache/cloudstack/pull/4485 
+.. _`#4461`: https://github.com/apache/cloudstack/pull/4461 
+.. _`#4476`: https://github.com/apache/cloudstack/pull/4476 
+.. _`#4078`: https://github.com/apache/cloudstack/pull/4078 
+.. _`#4428`: https://github.com/apache/cloudstack/pull/4428 
+.. _`#4475`: https://github.com/apache/cloudstack/pull/4475 
+.. _`#4452`: https://github.com/apache/cloudstack/pull/4452 
+.. _`#4446`: https://github.com/apache/cloudstack/pull/4446 
+.. _`#4469`: https://github.com/apache/cloudstack/pull/4469 
+.. _`#4464`: https://github.com/apache/cloudstack/pull/4464 
+.. _`#4289`: https://github.com/apache/cloudstack/pull/4289 
+.. _`#4465`: https://github.com/apache/cloudstack/pull/4465 
+.. _`#4456`: https://github.com/apache/cloudstack/pull/4456 
+.. _`#4418`: https://github.com/apache/cloudstack/pull/4418 
+.. _`#4327`: https://github.com/apache/cloudstack/pull/4327 
+.. _`#4437`: https://github.com/apache/cloudstack/pull/4437 
+.. _`#4442`: https://github.com/apache/cloudstack/pull/4442 
+.. _`#4439`: https://github.com/apache/cloudstack/pull/4439 
+.. _`#4430`: https://github.com/apache/cloudstack/pull/4430 
+.. _`#4440`: https://github.com/apache/cloudstack/pull/4440 
+.. _`#4408`: https://github.com/apache/cloudstack/pull/4408 
+.. _`#4341`: https://github.com/apache/cloudstack/pull/4341 
+.. _`#4388`: https://github.com/apache/cloudstack/pull/4388 
+.. _`#4435`: https://github.com/apache/cloudstack/pull/4435 
+.. _`#4177`: https://github.com/apache/cloudstack/pull/4177 
+.. _`#4429`: https://github.com/apache/cloudstack/pull/4429 
+.. _`#4359`: https://github.com/apache/cloudstack/pull/4359 
+.. _`#4426`: https://github.com/apache/cloudstack/pull/4426 
+.. _`#4432`: https://github.com/apache/cloudstack/pull/4432 
+.. _`#4144`: https://github.com/apache/cloudstack/pull/4144 
+.. _`#3945`: https://github.com/apache/cloudstack/pull/3945 
+.. _`#4363`: https://github.com/apache/cloudstack/pull/4363 
+.. _`#4417`: https://github.com/apache/cloudstack/pull/4417 
+.. _`#4414`: https://github.com/apache/cloudstack/pull/4414 
+.. _`#4367`: https://github.com/apache/cloudstack/pull/4367 
+.. _`#4427`: https://github.com/apache/cloudstack/pull/4427 
+.. _`#4420`: https://github.com/apache/cloudstack/pull/4420 
+.. _`#4415`: https://github.com/apache/cloudstack/pull/4415 
+.. _`#4307`: https://github.com/apache/cloudstack/pull/4307 
+.. _`#4375`: https://github.com/apache/cloudstack/pull/4375 
+.. _`#2206`: https://github.com/apache/cloudstack/pull/2206 
+.. _`#4409`: https://github.com/apache/cloudstack/pull/4409 
+.. _`#4413`: https://github.com/apache/cloudstack/pull/4413 
+.. _`#4360`: https://github.com/apache/cloudstack/pull/4360 
+.. _`#4193`: https://github.com/apache/cloudstack/pull/4193 
+.. _`#4411`: https://github.com/apache/cloudstack/pull/4411 
+.. _`#4412`: https://github.com/apache/cloudstack/pull/4412 
+.. _`#67`: https://github.com/apache/cloudstack/pull/67 
+.. _`#3946`: https://github.com/apache/cloudstack/pull/3946 
+.. _`#4387`: https://github.com/apache/cloudstack/pull/4387 
+.. _`#4407`: https://github.com/apache/cloudstack/pull/4407 
+.. _`#4395`: https://github.com/apache/cloudstack/pull/4395 
+.. _`#4194`: https://github.com/apache/cloudstack/pull/4194 
+.. _`#4251`: https://github.com/apache/cloudstack/pull/4251 
+.. _`#4405`: https://github.com/apache/cloudstack/pull/4405 
+.. _`#4377`: https://github.com/apache/cloudstack/pull/4377 
+.. _`#4381`: https://github.com/apache/cloudstack/pull/4381 
+.. _`#4228`: https://github.com/apache/cloudstack/pull/4228 
+.. _`#4348`: https://github.com/apache/cloudstack/pull/4348 
+.. _`#4404`: https://github.com/apache/cloudstack/pull/4404 
+.. _`#4383`: https://github.com/apache/cloudstack/pull/4383 
+.. _`#4382`: https://github.com/apache/cloudstack/pull/4382 
+.. _`#4379`: https://github.com/apache/cloudstack/pull/4379 
+.. _`#4373`: https://github.com/apache/cloudstack/pull/4373 
+.. _`#4366`: https://github.com/apache/cloudstack/pull/4366 
+.. _`#4365`: https://github.com/apache/cloudstack/pull/4365 
+.. _`#4397`: https://github.com/apache/cloudstack/pull/4397 
+.. _`#4376`: https://github.com/apache/cloudstack/pull/4376 
+.. _`#4374`: https://github.com/apache/cloudstack/pull/4374 
+.. _`#4389`: https://github.com/apache/cloudstack/pull/4389 
+.. _`#4271`: https://github.com/apache/cloudstack/pull/4271 
+.. _`#4321`: https://github.com/apache/cloudstack/pull/4321 
+.. _`#4354`: https://github.com/apache/cloudstack/pull/4354 
+.. _`#4352`: https://github.com/apache/cloudstack/pull/4352 
+.. _`#4269`: https://github.com/apache/cloudstack/pull/4269 
+.. _`#4338`: https://github.com/apache/cloudstack/pull/4338 
+.. _`#4345`: https://github.com/apache/cloudstack/pull/4345 
+.. _`#4340`: https://github.com/apache/cloudstack/pull/4340 
+.. _`#4190`: https://github.com/apache/cloudstack/pull/4190 
+.. _`#4328`: https://github.com/apache/cloudstack/pull/4328 
+.. _`#4336`: https://github.com/apache/cloudstack/pull/4336 
+.. _`#4305`: https://github.com/apache/cloudstack/pull/4305 
+.. _`#4335`: https://github.com/apache/cloudstack/pull/4335 
+.. _`#4319`: https://github.com/apache/cloudstack/pull/4319 
+.. _`#4303`: https://github.com/apache/cloudstack/pull/4303 
+.. _`#4239`: https://github.com/apache/cloudstack/pull/4239 
+.. _`#4323`: https://github.com/apache/cloudstack/pull/4323 
+.. _`#4319`: https://github.com/apache/cloudstack/pull/4319 
+.. _`#4331`: https://github.com/apache/cloudstack/pull/4331 
+.. _`#4333`: https://github.com/apache/cloudstack/pull/4333 
+.. _`#4294`: https://github.com/apache/cloudstack/pull/4294 
+.. _`#4316`: https://github.com/apache/cloudstack/pull/4316 
+.. _`#4309`: https://github.com/apache/cloudstack/pull/4309 
+.. _`#4326`: https://github.com/apache/cloudstack/pull/4326 
+.. _`#4315`: https://github.com/apache/cloudstack/pull/4315 
+.. _`#4053`: https://github.com/apache/cloudstack/pull/4053 
+.. _`#4312`: https://github.com/apache/cloudstack/pull/4312 
+.. _`#4320`: https://github.com/apache/cloudstack/pull/4320 
+.. _`#4317`: https://github.com/apache/cloudstack/pull/4317 
+.. _`#4297`: https://github.com/apache/cloudstack/pull/4297 
+.. _`#4306`: https://github.com/apache/cloudstack/pull/4306 
+.. _`#4301`: https://github.com/apache/cloudstack/pull/4301 
+.. _`#4291`: https://github.com/apache/cloudstack/pull/4291 
+.. _`#4284`: https://github.com/apache/cloudstack/pull/4284 
+.. _`#4279`: https://github.com/apache/cloudstack/pull/4279 
+.. _`#4020`: https://github.com/apache/cloudstack/pull/4020 
+.. _`#4258`: https://github.com/apache/cloudstack/pull/4258 
+.. _`#3996`: https://github.com/apache/cloudstack/pull/3996 
+.. _`#3902`: https://github.com/apache/cloudstack/pull/3902 
+.. _`#4288`: https://github.com/apache/cloudstack/pull/4288 
+.. _`#4287`: https://github.com/apache/cloudstack/pull/4287 
+.. _`#4266`: https://github.com/apache/cloudstack/pull/4266 
+.. _`#4264`: https://github.com/apache/cloudstack/pull/4264 
+.. _`#4272`: https://github.com/apache/cloudstack/pull/4272 
+.. _`#4274`: https://github.com/apache/cloudstack/pull/4274 
+.. _`#4278`: https://github.com/apache/cloudstack/pull/4278 
+.. _`#4219`: https://github.com/apache/cloudstack/pull/4219 
+.. _`#4040`: https://github.com/apache/cloudstack/pull/4040 
+.. _`#4275`: https://github.com/apache/cloudstack/pull/4275 
+.. _`#4180`: https://github.com/apache/cloudstack/pull/4180 
+.. _`#4068`: https://github.com/apache/cloudstack/pull/4068 
+.. _`#4268`: https://github.com/apache/cloudstack/pull/4268 
+.. _`#4262`: https://github.com/apache/cloudstack/pull/4262 
+.. _`#4207`: https://github.com/apache/cloudstack/pull/4207 
+.. _`#4254`: https://github.com/apache/cloudstack/pull/4254 
+.. _`#4128`: https://github.com/apache/cloudstack/pull/4128 
+.. _`#4213`: https://github.com/apache/cloudstack/pull/4213 
+.. _`#4255`: https://github.com/apache/cloudstack/pull/4255 
+.. _`#4256`: https://github.com/apache/cloudstack/pull/4256 
+.. _`#4260`: https://github.com/apache/cloudstack/pull/4260 
+.. _`#4016`: https://github.com/apache/cloudstack/pull/4016 
+.. _`#4253`: https://github.com/apache/cloudstack/pull/4253 
+.. _`#4249`: https://github.com/apache/cloudstack/pull/4249 
+.. _`#4243`: https://github.com/apache/cloudstack/pull/4243 
+.. _`#4019`: https://github.com/apache/cloudstack/pull/4019 
+.. _`#4165`: https://github.com/apache/cloudstack/pull/4165 
+.. _`#4220`: https://github.com/apache/cloudstack/pull/4220 
+.. _`#4225`: https://github.com/apache/cloudstack/pull/4225 
+.. _`#4000`: https://github.com/apache/cloudstack/pull/4000 
+.. _`#4231`: https://github.com/apache/cloudstack/pull/4231 
+.. _`#4116`: https://github.com/apache/cloudstack/pull/4116 
+.. _`#3952`: https://github.com/apache/cloudstack/pull/3952 
+.. _`#4175`: https://github.com/apache/cloudstack/pull/4175 
+.. _`#4035`: https://github.com/apache/cloudstack/pull/4035 
+.. _`#4214`: https://github.com/apache/cloudstack/pull/4214 
+.. _`#4226`: https://github.com/apache/cloudstack/pull/4226 
+.. _`#4188`: https://github.com/apache/cloudstack/pull/4188 
+.. _`#4138`: https://github.com/apache/cloudstack/pull/4138 
+.. _`#4156`: https://github.com/apache/cloudstack/pull/4156 
+.. _`#4172`: https://github.com/apache/cloudstack/pull/4172 
+.. _`#4196`: https://github.com/apache/cloudstack/pull/4196 
+.. _`#4176`: https://github.com/apache/cloudstack/pull/4176 
+.. _`#4202`: https://github.com/apache/cloudstack/pull/4202 
+.. _`#3979`: https://github.com/apache/cloudstack/pull/3979 
+.. _`#4174`: https://github.com/apache/cloudstack/pull/4174 
+.. _`#4117`: https://github.com/apache/cloudstack/pull/4117 
+.. _`#4071`: https://github.com/apache/cloudstack/pull/4071 
+.. _`#4186`: https://github.com/apache/cloudstack/pull/4186 
+.. _`#4001`: https://github.com/apache/cloudstack/pull/4001 
+.. _`#3976`: https://github.com/apache/cloudstack/pull/3976 
+.. _`#4103`: https://github.com/apache/cloudstack/pull/4103 
+.. _`#4148`: https://github.com/apache/cloudstack/pull/4148 
+.. _`#4171`: https://github.com/apache/cloudstack/pull/4171 
+.. _`#4167`: https://github.com/apache/cloudstack/pull/4167 
+.. _`#4164`: https://github.com/apache/cloudstack/pull/4164 
+.. _`#4154`: https://github.com/apache/cloudstack/pull/4154 
+.. _`#4004`: https://github.com/apache/cloudstack/pull/4004 
+.. _`#4162`: https://github.com/apache/cloudstack/pull/4162 
+.. _`#4132`: https://github.com/apache/cloudstack/pull/4132 
+.. _`#4145`: https://github.com/apache/cloudstack/pull/4145 
+.. _`#3998`: https://github.com/apache/cloudstack/pull/3998 
+.. _`#4085`: https://github.com/apache/cloudstack/pull/4085 
+.. _`#4140`: https://github.com/apache/cloudstack/pull/4140 
+.. _`#4007`: https://github.com/apache/cloudstack/pull/4007 
+.. _`#4003`: https://github.com/apache/cloudstack/pull/4003 
+.. _`#4121`: https://github.com/apache/cloudstack/pull/4121 
+.. _`#3991`: https://github.com/apache/cloudstack/pull/3991 
+.. _`#4070`: https://github.com/apache/cloudstack/pull/4070 
+.. _`#4130`: https://github.com/apache/cloudstack/pull/4130 
+.. _`#4122`: https://github.com/apache/cloudstack/pull/4122 
+.. _`#3982`: https://github.com/apache/cloudstack/pull/3982 
+.. _`#4073`: https://github.com/apache/cloudstack/pull/4073 
+.. _`#4075`: https://github.com/apache/cloudstack/pull/4075 
+.. _`#3949`: https://github.com/apache/cloudstack/pull/3949 
+.. _`#3955`: https://github.com/apache/cloudstack/pull/3955 
+.. _`#3980`: https://github.com/apache/cloudstack/pull/3980 
+.. _`#4048`: https://github.com/apache/cloudstack/pull/4048 
+.. _`#4083`: https://github.com/apache/cloudstack/pull/4083 
+.. _`#4142`: https://github.com/apache/cloudstack/pull/4142 
+.. _`#4109`: https://github.com/apache/cloudstack/pull/4109 
+.. _`#4077`: https://github.com/apache/cloudstack/pull/4077 
+.. _`#4021`: https://github.com/apache/cloudstack/pull/4021 
+.. _`#3965`: https://github.com/apache/cloudstack/pull/3965 
+.. _`#4104`: https://github.com/apache/cloudstack/pull/4104 
+.. _`#4017`: https://github.com/apache/cloudstack/pull/4017 
+.. _`#4079`: https://github.com/apache/cloudstack/pull/4079 
+.. _`#4046`: https://github.com/apache/cloudstack/pull/4046 
+.. _`#4013`: https://github.com/apache/cloudstack/pull/4013 
+.. _`#4062`: https://github.com/apache/cloudstack/pull/4062 
+.. _`#4119`: https://github.com/apache/cloudstack/pull/4119 
+.. _`#4126`: https://github.com/apache/cloudstack/pull/4126 
+.. _`#4123`: https://github.com/apache/cloudstack/pull/4123 
+.. _`#4065`: https://github.com/apache/cloudstack/pull/4065 
+.. _`#4124`: https://github.com/apache/cloudstack/pull/4124 
+.. _`#3794`: https://github.com/apache/cloudstack/pull/3794 
+.. _`#4100`: https://github.com/apache/cloudstack/pull/4100 
+.. _`#3921`: https://github.com/apache/cloudstack/pull/3921 
+.. _`#4110`: https://github.com/apache/cloudstack/pull/4110 
+.. _`#4092`: https://github.com/apache/cloudstack/pull/4092 
+.. _`#4097`: https://github.com/apache/cloudstack/pull/4097 
+.. _`#3967`: https://github.com/apache/cloudstack/pull/3967 
+.. _`#4087`: https://github.com/apache/cloudstack/pull/4087 
diff --git a/source/releasenotes/compat.rst b/source/releasenotes/compat.rst
index 253e5e6..4bb4747 100644
--- a/source/releasenotes/compat.rst
+++ b/source/releasenotes/compat.rst
@@ -22,15 +22,15 @@
 This section lists the operating systems that are supported for running
 CloudStack Management Server.
 
--  RHEL versions 7.x
--  CentOS versions 7.x
--  Ubuntu 16.04 LTS, 18.04 LTS
+-  Ubuntu 16.04 LTS, 18.04 LTS, 20.04 LTS
+-  CentOS versions 7.x, 8.x (note: CentOS 8 will EOL in Dec 2021)
+-  RHEL versions 7.x, 8.x
 
 Software Requirements
 ~~~~~~~~~~~~~~~~~~~~~
 
 -  Java JRE 11
--  MySQL 5.5, 5.6, 5.7
+-  MySQL 5.6, 5.7, 8.0
 
 Supported Hypervisor Versions
 -----------------------------
@@ -38,14 +38,14 @@
 CloudStack supports three hypervisor families, XenServer with XAPI, KVM,
 and VMware with vSphere.
 
--  CentOS 7.x with KVM
--  Ubuntu 16.04 LTS, 18.04 LTS with KVM
--  Red Hat Enterprise Linux 7.x with KVM
--  XenServer versions 7.0, 7.1, 7.2, 7.4, 7.5 with latest hotfixes, XCP-ng 7.4, 7.6
+-  Ubuntu 16.04 LTS, 18.04, 20.04 LTS with KVM
+-  CentOS 7.x, 8.x with KVM (note: CentOS 8 will EOL in Dec 2021)
+-  Red Hat Enterprise Linux 7.x, 8.x with KVM
+-  XenServer versions 7.0, 7.1, 7.2, 7.4, 7.5, 8.0 with latest hotfixes, XCP-ng 7.4, 7.6, 8.0, 8.1
 
    .. note:: It is now required to enable HA on the XenServer pool in order to recover from a pool-master failure. Please refer to the `XenServer documentation <https://docs.citrix.com/en-us/xencenter/7-1/pools-ha-enable.html>`_.
 
--  VMware versions 6.0, 6.5 and 6.7 (tested up to 6.7 U3)
+-  VMware versions 6.5 and 6.7 (tested up to 6.7 U3)
 
    .. note:: There is a known issue in 6.7 U1 (https://kb.vmware.com/s/article/67315) which blocks some CloudStack cloning operations. The use of linked clones is known to be effected.
 
@@ -80,11 +80,11 @@
 of the UI reliably, depending on their support of Web standards. For
 best results, one of the following browsers recommended:
 
--  Firefox version 31 or later
+-  Firefox version 75 or later
 
--  Google Chrome version 36.0+
+-  Google Chrome version 85 or later
 
--  Safari 6+
+-  Safari 12+
 
 Notice Of Management OSes and Hypervisors to be Deprecated
 ----------------------------------------------------------
@@ -96,6 +96,7 @@
 -  vSphere 5.0
 -  vSphere 5.1
 -  vSphere 5.5
+-  vSphere 6.0
 -  CentOS/RHEL (KVM) 6.x
 -  Ubuntu 14.04
 
@@ -104,6 +105,5 @@
 -  CentOS 6.x
 -  Ubuntu 14.04
 
-
 Please see `CloudStack Wiki <https://cwiki.apache.org/confluence/display/CLOUDSTACK/Hypervisor+and+Management+Server+OS+EOL+Dates>`_ 
 for details.
diff --git a/source/upgrading/index.rst b/source/upgrading/index.rst
index 7bb6c28..5186e1c 100644
--- a/source/upgrading/index.rst
+++ b/source/upgrading/index.rst
@@ -37,6 +37,7 @@
 .. toctree::
    :maxdepth: 1
  
+   upgrade/upgrade-4.14
    upgrade/upgrade-4.13
    upgrade/upgrade-4.12
    upgrade/upgrade-4.11
diff --git a/source/upgrading/upgrade/upgrade-4.14.rst b/source/upgrading/upgrade/upgrade-4.14.rst
new file mode 100644
index 0000000..0065adf
--- /dev/null
+++ b/source/upgrading/upgrade/upgrade-4.14.rst
@@ -0,0 +1,314 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information#
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+.. |version_to_upgrade| replace:: 4.14.x
+
+Upgrade Instruction from |version_to_upgrade|
+=============================================
+
+
+This section will show you how to upgrade from CloudStack |version_to_upgrade| to latest
+CloudStack |release|.
+
+Any steps that are hypervisor-specific will be called out with a note.
+
+We recommend reading through this section once or twice before beginning
+your upgrade procedure, and working through it on a test system before
+working on a production system.
+
+.. note::
+    The following upgrade instructions should be performed regardless of
+    hypervisor type.
+
+Overview of Upgrade Steps:
+----------------------------
+
+#. Check any customisations and integrations
+#. Upload the |sysvm64-version| System VM template if not already using it.
+#. Confirm Java 11 is the default Java version
+#. Stop all running management servers
+#. Backup CloudStack database (MySQL)
+#. Add "serverTimezone=UTC" to your "db.properties"
+#. Upgrade 1st CloudStack management server
+#. Update hypervisors specific dependencies
+#. Restart 1st management server
+#. Check that your upgraded environment works as expected
+#. Upgrade and restart the remaining management servers
+
+
+.. include:: _customisation_warnings.rst
+
+.. warning::
+    If you are not already using the |sysvm64-version| System VM template you will need to
+    upgrade your System VM template prior to performing the upgrade of the
+    CloudStack packages.
+
+.. include:: _sysvm_templates.rst
+
+.. include:: _java_version.rst
+
+Packages repository
+-------------------
+
+Most users of CloudStack manage the installation and upgrades of
+CloudStack with one of Linux's predominant package systems, RPM or
+APT. This guide assumes you'll be using RPM and Yum (for Red Hat
+Enterprise Linux or CentOS), or APT and Debian packages (for Ubuntu).
+
+Create RPM or Debian packages (as appropriate) and a repository from
+the |release| source, or check the Apache CloudStack downloads page at
+http://cloudstack.apache.org/downloads.html
+for package repositories supplied by community members. You will need
+them for :ref:`ubuntu414` or :ref:`kvm414` hosts upgrade.
+
+Instructions for creating packages from the CloudStack source are in the
+`CloudStack Installation Guide`_.
+
+Database Preparation
+--------------------
+
+Backup current database
+
+#. Stop your management server or servers. Run this on all management
+   server hosts:
+
+   .. parsed-literal::
+
+      $ sudo service cloudstack-management stop
+
+#. If you are running a usage server or usage servers, stop those as well:
+
+   .. parsed-literal::
+
+      $ sudo service cloudstack-usage stop
+
+#. Make a backup of your MySQL database. If you run into any issues or
+   need to roll back the upgrade, this will assist in debugging or
+   restoring your existing environment. You'll be prompted for your
+   password.
+
+   .. parsed-literal::
+
+      $ mysqldump -u root -p -R cloud > cloud-backup_`date '+%Y-%m-%d'`.sql
+      $ mysqldump -u root -p cloud_usage > cloud_usage-backup_`date '+%Y-%m-%d'`.sql
+
+
+.. _ubuntu414:
+.. _apt-repo414:
+
+Management Server
+-----------------
+
+.. include:: _timezone.rst
+
+Ubuntu
+######
+
+If you are using Ubuntu, follow this procedure to upgrade your packages. If
+not, skip to step :ref:`rhel414`.
+
+.. note::
+   **Community Packages:** This section assumes you're using the community
+   supplied packages for CloudStack. If you've created your own packages and
+   APT repository, substitute your own URL for the ones used in these examples.
+
+The first order of business will be to change the sources list for
+each system with CloudStack packages. This means all management
+servers, and any hosts that have the KVM agent (no changes should
+be necessary for hosts that are running VMware or Xen.)
+
+Edit your ``/etc/apt/sources.list.d/cloudstack.list`` file on
+any systems that have CloudStack packages installed to points to version |version|
+
+This file should have one line, which contains:
+
+.. parsed-literal::
+
+   deb http://download.cloudstack.org/ubuntu bionic |version|
+
+Setup the public key for the above repository:
+
+.. parsed-literal::
+
+   wget -qO - http://download.cloudstack.org/release.asc | sudo apt-key add -
+
+#. Now update your apt package list:
+
+   .. parsed-literal::
+
+      $ sudo apt-get update
+
+#. Now that you have the repository configured, it's time to upgrade
+   the ``cloudstack-management`` package.
+
+   .. parsed-literal::
+
+      $ sudo apt-get upgrade cloudstack-management
+
+#. If you use CloudStack usage server
+
+   .. parsed-literal::
+
+      $ sudo apt-get upgrade cloudstack-usage
+
+
+.. _rhel414:
+.. _rpm-repo414:
+
+CentOS/RHEL
+##############
+
+If you are using CentOS or RHEL, follow this procedure to upgrade your
+packages. If not, skip to hypervisors section :ref:`upg_hyp_414`.
+
+.. note::
+   **Community Packages:** This section assumes you're using the community
+   supplied packages for CloudStack. If you've created your own packages and
+   yum repository, substitute your own URL for the ones used in these examples.
+
+The first order of business will be to change the yum repository
+for each system with CloudStack packages. This means all
+management servers, and any hosts that have the KVM agent (no changes
+should be necessary for hosts that are running VMware or Xen.)
+
+Change your ``/etc/yum.repos.d/cloudstack.repo`` file on
+any systems that have CloudStack packages installed to points to version |version|.
+
+This file should have content similar to the following:
+
+.. parsed-literal::
+
+   [apache-cloudstack]
+   name=Apache CloudStack
+   baseurl=http://download.cloudstack.org/centos/$releasever/|version|/
+   enabled=1
+   gpgcheck=0
+
+Setup the GPG public key if you wish to enable ``gpgcheck=1``:
+
+.. parsed-literal::
+
+   rpm --import http://download.cloudstack.org/RPM-GPG-KEY
+
+#. Now that you have the repository configured, it's time to upgrade the
+   ``cloudstack-management``.
+
+   .. parsed-literal::
+
+      $ sudo yum upgrade cloudstack-management
+
+#. If you use CloudStack usage server
+
+   .. parsed-literal::
+
+      $ sudo yum upgrade cloudstack-usage
+
+.. _upg_hyp_414:
+
+Upgrade Hypervisors
+-------------------
+
+Hypervisor: XenServer
+#####################
+
+
+No additional steps are required for XenServer Hypervisor for this upgrade.
+
+
+Hypervisor: VMware
+###################
+
+.. warning::
+   For VMware hypervisor, CloudStack management server packages must be
+   built using "noredist". Refer to :ref:`building-noredist`.
+
+
+No additional steps are requried for the VMware Hypervisor for this upgrade.
+
+
+.. _kvm414:
+
+Hypervisor: KVM
+#################
+
+KVM on Ubuntu
+""""""""""""""
+
+(KVM only) Additional steps are required for each KVM host. These
+steps will not affect running guests in the cloud. These steps are
+required only for clouds using KVM as hosts and only on the KVM
+hosts.
+
+#. Configure the :ref:`APT repo <apt-repo414>` as detailed above.
+
+#. Stop the running agent.
+
+   .. parsed-literal::
+
+      $ sudo service cloudstack-agent stop
+
+#. Update the agent software.
+
+   .. parsed-literal::
+
+      $ sudo apt-get upgrade cloudstack-agent
+
+#. Start the agent.
+
+   .. parsed-literal::
+
+      $ sudo service cloudstack-agent start
+
+
+KVM on CentOS/RHEL
+"""""""""""""""""""
+
+For KVM hosts, upgrade the ``cloudstack-agent`` package
+
+#. Configure the :ref:`rpm-repo414` as detailed above.
+
+   .. parsed-literal::
+
+      $ sudo yum install -y epel-release
+      $ sudo yum install -y python36-libvirt
+      $ sudo yum upgrade cloudstack-agent
+
+#. Restart the agent:
+
+   .. parsed-literal::
+
+      $ sudo service cloudstack-agent stop
+      $ sudo service cloudstack-agent start
+
+
+Restart management services
+---------------------------
+
+#. Now it's time to start the management server
+
+   .. parsed-literal::
+
+      $ sudo service cloudstack-management start
+
+#. If you use it, start the usage server
+
+   .. parsed-literal::
+
+      $ sudo service cloudstack-usage start
+
+System-VMs and Virtual-Routers
+------------------------------
+
+.. include:: _sysvm_restart.rst
diff --git a/source/upgrading/upgrade/upgrade_notes.rst b/source/upgrading/upgrade/upgrade_notes.rst
index cd53754..55a6288 100644
--- a/source/upgrading/upgrade/upgrade_notes.rst
+++ b/source/upgrading/upgrade/upgrade_notes.rst
@@ -27,19 +27,12 @@
 
 .. include:: _java_version.rst
 
-UI Deprecation Notice
----------------------
+UI Deprecation and Removal Notice
+---------------------------------
 
-The current jQuery-based CloudStack UI will be `deprecated
-<http://markmail.org/message/vxnskmwhfaagnm4r/>`_ in the next Apache CloudStack
-major release and removed in the subsequent future releases.
-
-`Primate <https://github.com/apache/cloudstack-primate/>`_ will ship as the
-modern UI for future Apache CloudStack releases. Users are encouraged to `test
-<https://github.com/apache/cloudstack-primate/wiki/Migrating-to-Primate/>`_
-Primate, report bugs and give feedback to the `dev community
-<http://cloudstack.apache.org/mailing-lists.html>`_ with this release of Apache
-CloudStack.
+The current jQuery-based CloudStack UI is `deprecated
+<http://markmail.org/message/vxnskmwhfaagnm4r/>`_ in this release of CloudStack
+and will be removed in the next release of Apache CloudStack.
 
 Migrating to dynamic roles feature
 ----------------------------------