diff --git a/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java b/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java
index d82a2975eaf..ce78f83fb4d 100644
--- a/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java
@@ -21,6 +21,9 @@ import com.cloud.agent.api.LogLevel;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * TO class sent to the hypervisor layer with the information needed to handle deploy-as-is VM deployments
+ */
 public class DeployAsIsInfoTO {
 
     private String templatePath;
diff --git a/api/src/main/java/com/cloud/agent/api/to/OVFInformationTO.java b/api/src/main/java/com/cloud/agent/api/to/OVFInformationTO.java
index 412d362441e..6c6c61d8e95 100644
--- a/api/src/main/java/com/cloud/agent/api/to/OVFInformationTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/OVFInformationTO.java
@@ -27,6 +27,9 @@ import com.cloud.utils.Pair;
 
 import java.util.List;
 
+/**
+ * Placeholder class for all the subclasses obtained from the OVF parsing
+ */
 public class OVFInformationTO {
 
     @LogLevel(LogLevel.Log4jLevel.Off)
diff --git a/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFConfigurationTO.java b/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFConfigurationTO.java
index f3cb75089ab..aa3c603f3d0 100644
--- a/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFConfigurationTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFConfigurationTO.java
@@ -20,6 +20,9 @@ package com.cloud.agent.api.to.deployasis;
 
 import java.util.List;
 
+/**
+ * This class represents a template deployment option (configuration) parsed from the OVF
+ */
 public class OVFConfigurationTO implements TemplateDeployAsIsInformationTO {
 
     private final String id;
diff --git a/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFVirtualHardwareItemTO.java b/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFVirtualHardwareItemTO.java
index 52577506653..f178c23e326 100644
--- a/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFVirtualHardwareItemTO.java
+++ b/api/src/main/java/com/cloud/agent/api/to/deployasis/OVFVirtualHardwareItemTO.java
@@ -16,10 +16,16 @@
 // under the License.
 package com.cloud.agent.api.to.deployasis;
 
-// From: https://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData.xsd
+/**
+ * A hardware item class representing a hardware item read from the OVF.
+ * From: https://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData.xsd
+ */
 public class OVFVirtualHardwareItemTO implements TemplateDeployAsIsInformationTO{
 
-    //From: https://schemas.dmtf.org/wbem/cim-html/2/CIM_ResourceAllocationSettingData.html
+    /**
+     * The hardware item type
+     * From: https://schemas.dmtf.org/wbem/cim-html/2/CIM_ResourceAllocationSettingData.html
+     */
     public enum HardwareResourceType {
         Other("Other", 1),
         ComputerSystem ("Computer System", 2),
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
index 157118285fc..5ef66c50b98 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
@@ -89,7 +89,8 @@ public class ListTemplatesCmd extends BaseListTaggedResourcesCmd implements User
     @Parameter(name = ApiConstants.DETAILS,
             type = CommandType.LIST,
             collectionType = CommandType.STRING,
-            description = "comma separated list of template details requested, value can be a list of [ all, resource, min]")
+            since = "4.15",
+            description = "comma separated list of template details requested, value can be a list of [ all, min]")
     private List<String> viewDetails;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
index c733f37a9fb..6e699230165 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -196,11 +196,13 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
     private Boolean directDownload;
 
     @SerializedName(ApiConstants.DEPLOY_AS_IS)
-    @Param(description = "VMware only: true if template is deployed without orchestrating disks and networks but \"as-is\" defined in the template.")
+    @Param(description = "VMware only: true if template is deployed without orchestrating disks and networks but \"as-is\" defined in the template.",
+            since = "4.15")
     private Boolean deployAsIs;
 
     @SerializedName(ApiConstants.DEPLOY_AS_IS_DETAILS)
-    @Param(description = "VMware only: additional key/value details tied with deploy-as-is template")
+    @Param(description = "VMware only: additional key/value details tied with deploy-as-is template",
+            since = "4.15")
     private Map<String, String> deployAsIsDetails;
 
     @SerializedName("parenttemplateid")