diff --git a/batch/resource-manager/v2017_05_01/pom.xml b/batch/resource-manager/v2017_05_01/pom.xml
index 6e7d7436bec5..ff0c9e2c8de9 100644
--- a/batch/resource-manager/v2017_05_01/pom.xml
+++ b/batch/resource-manager/v2017_05_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>0.0.3-beta</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-batch</artifactId>
     <version>1.0.0-beta</version>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationPackagesImpl.java b/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationPackagesImpl.java
index 08eb807b9ecb..c68245f4104e 100644
--- a/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationPackagesImpl.java
+++ b/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationPackagesImpl.java
@@ -54,10 +54,14 @@ public ApplicationPackage call(ApplicationPackageInner inner) {
     public Observable<ApplicationPackage> getAsync(String resourceGroupName, String accountName, String applicationId, String version) {
         ApplicationPackagesInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, applicationId, version)
-        .map(new Func1<ApplicationPackageInner, ApplicationPackage>() {
+        .flatMap(new Func1<ApplicationPackageInner, Observable<ApplicationPackage>>() {
             @Override
-            public ApplicationPackage call(ApplicationPackageInner inner) {
-                return wrapModel(inner);
+            public Observable<ApplicationPackage> call(ApplicationPackageInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ApplicationPackage)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationsImpl.java b/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationsImpl.java
index 2bda6028deab..7291b3f2bfb4 100644
--- a/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationsImpl.java
+++ b/batch/resource-manager/v2017_05_01/src/main/java/com/microsoft/azure/management/batch/v2017_05_01/implementation/ApplicationsImpl.java
@@ -74,10 +74,14 @@ public Application call(ApplicationInner inner) {
     public Observable<Application> getAsync(String resourceGroupName, String accountName, String applicationId) {
         ApplicationsInner client = this.inner();
         return client.getAsync(resourceGroupName, accountName, applicationId)
-        .map(new Func1<ApplicationInner, Application>() {
+        .flatMap(new Func1<ApplicationInner, Observable<Application>>() {
             @Override
-            public Application call(ApplicationInner inner) {
-                return wrapModel(inner);
+            public Observable<Application> call(ApplicationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Application)wrapModel(inner));
+                }
             }
        });
     }