Merge branch 'develop' into feature/0269_new_vehicle_data_climate_data

# Conflicts:
#	android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
#	android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
#	android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
#	android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
#	base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java

29 files changed, 894 insertions, 8 deletions

diff --git a/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json b/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
index a3f075cc5..8ce24a63e 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
@@ -36,7 +36,8 @@
       "oemCustomVehicleDataName": true,
       "windowStatus": true,
       "stabilityControlsStatus": true,
-      "climateData": true
+      "climateData": true,
+      "seatOccupancy": true
     }
   },
   "response": {
@@ -206,7 +207,31 @@
             "deviation": 3
           }
         }
-      ]
+      ],
+      "seatOccupancy": {
+        "seatsOccupied": [
+          {
+            "seatLocation": {
+              "grid": {
+                "row": 2,
+                "col": 3
+              }
+            },
+            "conditionActive": true
+          }
+        ],
+        "seatsBelted": [
+          {
+            "seatLocation": {
+              "grid": {
+                "row": 2,
+                "col": 3
+              }
+            },
+            "conditionActive": true
+          }
+        ]
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json b/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
index 4089dd2b8..57a8aa20b 100644
--- a/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
@@ -36,7 +36,8 @@
       "oemCustomVehicleDataName": true,
       "windowStatus": true,
       "handsOffSteering": true,
-      "climateData": true
+      "climateData": true,
+      "seatOccupancy": true
     }
   },
   "response": {
@@ -178,6 +179,10 @@
       "climateData": {
         "dataType": "VEHICLEDATA_CLIMATEDATA",
         "resultCode": "SUCCESS"
+      },
+      "seatOccupancy": {
+        "dataType": "VEHICLEDATA_SEATOCCUPANCY",
+        "resultCode": "SUCCESS"
       }
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json b/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
index 4dc881287..3dfbf984c 100644
--- a/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
@@ -36,7 +36,8 @@
       "gearStatus": true,
       "oemCustomVehicleDataName": true,
       "windowStatus": true,
-      "climateData": true
+      "climateData": true,
+      "seatOccupancy": true
     }
   },
   "response": {
@@ -175,6 +176,10 @@
         "dataType": "VEHICLEDATA_WINDOWSTATUS",
         "resultCode": "SUCCESS"
       },
+      "seatOccupancy": {
+        "dataType": "VEHICLEDATA_SEATOCCUPANCY",
+        "resultCode": "SUCCESS"
+      },
       "climateData": {
         "dataType": "VEHICLEDATA_CLIMATEDATA",
         "resultCode": "SUCCESS"
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
index 928b7bd09..3aba434c5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
@@ -205,7 +205,7 @@ public class SystemCapabilityManagerTests {
     @Test
     public void testNullDisplayCapabilitiesEnablesAllTextAndImageFields() {
         List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(null, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-        assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getTextFields().size(), 32);
+        assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getTextFields().size(), 34);
         assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getImageFields().size(), 16);
     }
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
index f38b6ec79..eeafa2edb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
@@ -334,6 +334,11 @@ public class TestValues {
     public static final DynamicUpdateCapabilities GENERAL_DYNAMICUPDATECAPABILITIES = new DynamicUpdateCapabilities();
     public static final WindowState GENERAL_WINDOWSTATE = new WindowState();
 
+    public static final SeatOccupancy GENERAL_SEAT_OCCUPANCY = new SeatOccupancy();
+    public static final List<SeatStatus> GENERAL_SEATS_OCCUPIED = new ArrayList<SeatStatus>(1);
+    public static final List<SeatStatus> GENERAL_SEATS_BELTED = new ArrayList<SeatStatus>(1);
+    public static final SeatStatus GENERAL_SEAT_STATUS = new SeatStatus();
+    public static final SeatLocation GENERAL_SEAT_LOCATION = new SeatLocation();
     public static final DoorStatusType GENERAL_DOOR_STATUS_TYPE = DoorStatusType.REMOVED;
 
     public static final DoorStatus GENERAL_DOOR_STATUS = new DoorStatus();
@@ -362,7 +367,6 @@ public class TestValues {
     public static final FuelType GENERAL_FUELTYPE = FuelType.GASOLINE;
     public static final LockScreenConfig GENERAL_LOCKSCREENCONFIG = new LockScreenConfig();
     public static final Grid GENERAL_GRID = new Grid();
-    public static final SeatLocation GENERAL_SEAT_LOCATION = new SeatLocation();
     public static final ModuleInfo GENERAL_MODULE_INFO = new ModuleInfo();
     public static final StabilityControlsStatus GENERAL_STABILITY_CONTROL_STATUS = new StabilityControlsStatus();
     public static final VehicleDataStatus GENERAL_ESC_SYSTEM = VehicleDataStatus.ON;
@@ -514,6 +518,10 @@ public class TestValues {
     public static final JSONObject JSON_DOOR_STATUS = new JSONObject();
     public static final JSONObject JSON_GATE_STATUS = new JSONObject();
     public static final JSONObject JSON_SEEK_STREAMING_INDICATOR = new JSONObject();
+    public static final JSONArray JSON_GENERAL_SEATS_OCCUPIED = new JSONArray();
+    public static final JSONArray JSON_GENERAL_SEATS_BELTED = new JSONArray();
+    public static final JSONObject JSON_OBJECT_GENERAL_SEATS_BELTED = new JSONObject();
+    public static final JSONObject JSON_OBJECT_GENERAL_SEATS_OCCUPIED = new JSONObject();
 
     static {
         GENERAL_TOUCHEVENTCAPABILITIES.setDoublePressAvailable(GENERAL_BOOLEAN);
@@ -1077,6 +1085,18 @@ public class TestValues {
         GENERAL_STABILITY_CONTROL_STATUS.setEscSystem(GENERAL_ESC_SYSTEM);
         GENERAL_STABILITY_CONTROL_STATUS.setTrailerSwayControl(GENERAL_S_WAY_CONTROL);
 
+        // SEAT_OCCUPANCY
+        GENERAL_SEAT_LOCATION.setGrid(GENERAL_LOCATION_GRID);
+
+        GENERAL_SEAT_STATUS.setConditionActive(GENERAL_BOOLEAN);
+        GENERAL_SEAT_STATUS.setSeatLocation(GENERAL_SEAT_LOCATION);
+
+        GENERAL_SEATS_BELTED.add(GENERAL_SEAT_STATUS);
+        GENERAL_SEATS_OCCUPIED.add(GENERAL_SEAT_STATUS);
+
+        GENERAL_SEAT_OCCUPANCY.setSeatsBelted(GENERAL_SEATS_BELTED);
+        GENERAL_SEAT_OCCUPANCY.setSeatsOccupied(GENERAL_SEATS_OCCUPIED);
+
         GENERAL_ROOF_STATUS.setLocation(GENERAL_GRID);
         GENERAL_ROOF_STATUS.setState(GENERAL_WINDOW_STATE);
         GENERAL_ROOF_STATUS.setStatus(GENERAL_DOOR_STATUS_TYPE);
@@ -1096,6 +1116,15 @@ public class TestValues {
         GENERAL_CLIMATEDATA.setExternalTemperature(GENERAL_TEMPERATURE);
 
         try {
+
+            JSON_OBJECT_GENERAL_SEATS_OCCUPIED.put(SeatStatus.KEY_SEAT_LOCATION, GENERAL_SEAT_LOCATION.serializeJSON());
+            JSON_OBJECT_GENERAL_SEATS_OCCUPIED.put(SeatStatus.KEY_CONDITION_ACTIVE, GENERAL_BOOLEAN);
+            JSON_GENERAL_SEATS_OCCUPIED.put(JSON_OBJECT_GENERAL_SEATS_OCCUPIED);
+
+            JSON_OBJECT_GENERAL_SEATS_BELTED.put(SeatStatus.KEY_SEAT_LOCATION, GENERAL_SEAT_LOCATION.serializeJSON());
+            JSON_OBJECT_GENERAL_SEATS_BELTED.put(SeatStatus.KEY_CONDITION_ACTIVE,GENERAL_BOOLEAN);
+            JSON_GENERAL_SEATS_BELTED.put(JSON_OBJECT_GENERAL_SEATS_BELTED);
+
             JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_ALLOWED, GENERAL_HMILEVEL_LIST);
             JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_USER_DISALLOWED, GENERAL_HMILEVEL_LIST);
 
@@ -1326,6 +1355,7 @@ public class TestValues {
             JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ALBUM);
             JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ARTIST);
 
+            JSON_GRID.put(SeatLocation.KEY_GRID, GENERAL_LOCATION_GRID.serializeJSON());
             JSON_SEAT_LOCATIONS.put(JSON_GRID);
             JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_ID, TestValues.GENERAL_STRING);
             JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_LOCATION, TestValues.JSON_GRID);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
index 28819a9f2..6db76934f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
@@ -3910,6 +3910,23 @@ public class Validator {
         return approxPosition1.equals(approxPosition2) && deviation1.equals(deviation2);
     }
 
+    public static boolean validateSeatOccupancies(SeatOccupancy item1, SeatOccupancy item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        List<SeatStatus> seatsBelted1 = item1.getSeatsBelted();
+        List<SeatStatus> seatsOccupied1 = item1.getSeatsOccupied();
+
+        List<SeatStatus> seatsBelted2 = item2.getSeatsBelted();
+        List<SeatStatus> seatsOccupied2 = item2.getSeatsOccupied();
+
+        return validateSeatStatuses(seatsBelted1, seatsBelted2) && validateSeatStatuses(seatsOccupied1, seatsOccupied2);
+    }
+
     public static boolean validateStabilityControlStatus(StabilityControlsStatus status1, StabilityControlsStatus status2) {
         if (status1 == null) {
             return (status2 == null);
@@ -3930,6 +3947,48 @@ public class Validator {
         return status1.getDataType().equals(status2.getDataType()) && status1.getResultCode().equals(status2.getResultCode());
     }
 
+    public static boolean validateSeatStatuses(List<SeatStatus> seatStatusesItem1, List<SeatStatus> seatStatusesItem2) {
+        if (seatStatusesItem1 == null) {
+            return (seatStatusesItem2 == null);
+        }
+        if (seatStatusesItem2 == null) {
+            return (seatStatusesItem1 == null);
+        }
+
+        if (seatStatusesItem1.size() != seatStatusesItem2.size()) {
+            return false;
+        }
+
+        Iterator<SeatStatus> iterator1 = seatStatusesItem1.iterator();
+        Iterator<SeatStatus> iterator2 = seatStatusesItem2.iterator();
+
+        while (iterator1.hasNext() && iterator2.hasNext()) {
+            SeatStatus seatStatus1 = iterator1.next();
+            SeatStatus seatStatus2 = iterator2.next();
+
+            if (!validateSeatStatus(seatStatus1, seatStatus2)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateSeatStatus(SeatStatus item1, SeatStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getConditionActive() != item2.getConditionActive()) {
+            return false;
+        }
+
+        return validateSeatLocation(item1.getSeatLocation(), item2.getSeatLocation());
+    }
+
     public static boolean validateDoorStatus(DoorStatus status1, DoorStatus status2) {
         if (status1 == null) {
             return (status2 == null);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
index cf9315934..a53e6aa69 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
@@ -16,6 +16,9 @@ import com.smartdevicelink.proxy.rpc.Grid;
 import com.smartdevicelink.proxy.rpc.HeadLampStatus;
 import com.smartdevicelink.proxy.rpc.MyKey;
 import com.smartdevicelink.proxy.rpc.OnVehicleData;
+import com.smartdevicelink.proxy.rpc.SeatLocation;
+import com.smartdevicelink.proxy.rpc.SeatOccupancy;
+import com.smartdevicelink.proxy.rpc.SeatStatus;
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.StabilityControlsStatus;
 import com.smartdevicelink.proxy.rpc.Temperature;
@@ -99,6 +102,9 @@ public class VehicleDataHelper {
     public static final Temperature CLIMATE_DATA_CABIN_TEMP = new Temperature(TemperatureUnit.CELSIUS, TestValues.GENERAL_FLOAT);
     public static final Temperature CLIMATE_DATA_EXT_TEMP = new Temperature(TemperatureUnit.CELSIUS, TestValues.GENERAL_FLOAT);
 
+    // Seat Occupancy
+    public static final SeatOccupancy SEAT_OCCUPANCY = new SeatOccupancy();
+
     //other variables inside some of the above objects
     // tire status
     public static final WarningLightStatus TIRE_PRESSURE_TELL_TALE = WarningLightStatus.ON;
@@ -235,6 +241,11 @@ public class VehicleDataHelper {
     //GetVehicleDataResponse data which stores the same things
     public static final GetVehicleDataResponse VEHICLE_DATA_RESPONSE = new GetVehicleDataResponse();
 
+    public static final List<SeatStatus> SEATS_OCCUPIED = new ArrayList<SeatStatus>(1);
+    public static final List<SeatStatus> SEATS_BELTED = new ArrayList<SeatStatus>(1);
+    public static final SeatStatus SEAT_STATUS = new SeatStatus();
+    public static final SeatLocation SEAT_LOCATION = new SeatLocation();
+
     static {
         //TIRE_PRESSURE set up
         TIRE_PRESSURE.setPressureTellTale(TIRE_PRESSURE_TELL_TALE);
@@ -387,6 +398,18 @@ public class VehicleDataHelper {
         GEAR_STATUS.setUserSelectedGear(USER_SELECTED_GEAR);
         GEAR_STATUS.setActualGear(ACTUAL_GEAR);
 
+        // SEAT_OCCUPANCY
+        SEAT_LOCATION.setGrid(LOCATION_GRID);
+
+        SEAT_STATUS.setConditionActive(true);
+        SEAT_STATUS.setSeatLocation(SEAT_LOCATION);
+
+        SEATS_BELTED.add(SEAT_STATUS);
+        SEATS_OCCUPIED.add(SEAT_STATUS);
+
+        SEAT_OCCUPANCY.setSeatsBelted(SEATS_BELTED);
+        SEAT_OCCUPANCY.setSeatsOccupied(SEATS_OCCUPIED);
+
         //set up the OnVehicleData object
         VEHICLE_DATA.setSpeed(SPEED);
         VEHICLE_DATA.setRpm(RPM);
@@ -423,6 +446,7 @@ public class VehicleDataHelper {
         VEHICLE_DATA.setStabilityControlsStatus(STABILITY_CONTROLS_STATUS);
         VEHICLE_DATA.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, OEM_CUSTOM_VEHICLE_DATA_STATE);
         VEHICLE_DATA.setHandsOffSteering(HANDS_OFF_STEERING);
+        VEHICLE_DATA.setSeatOccupancy(SEAT_OCCUPANCY);
         //set up the GetVehicleDataResponse object
         VEHICLE_DATA_RESPONSE.setSpeed(SPEED);
         VEHICLE_DATA_RESPONSE.setRpm(RPM);
@@ -459,6 +483,7 @@ public class VehicleDataHelper {
         VEHICLE_DATA_RESPONSE.setStabilityControlsStatus(STABILITY_CONTROLS_STATUS);
         VEHICLE_DATA_RESPONSE.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, OEM_CUSTOM_VEHICLE_DATA_STATE);
         VEHICLE_DATA_RESPONSE.setHandsOffSteering(HANDS_OFF_STEERING);
+        VEHICLE_DATA_RESPONSE.setSeatOccupancy(SEAT_OCCUPANCY);
     }
 
     private VehicleDataHelper() {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatOccupancyTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatOccupancyTests.java
new file mode 100644
index 000000000..70da261b0
--- /dev/null
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatOccupancyTests.java
@@ -0,0 +1,83 @@
+package com.smartdevicelink.test.rpc.datatypes;
+
+
+import com.smartdevicelink.marshal.JsonRPCMarshaller;
+import com.smartdevicelink.proxy.rpc.SeatOccupancy;
+import com.smartdevicelink.proxy.rpc.SeatStatus;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.TestValues;
+import com.smartdevicelink.test.Validator;
+
+import junit.framework.TestCase;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+
+public class SeatOccupancyTests extends TestCase {
+
+    private SeatOccupancy msg;
+
+    @Override
+    public void setUp() {
+        msg = new SeatOccupancy();
+
+        msg.setSeatsOccupied(TestValues.GENERAL_SEATS_OCCUPIED);
+        msg.setSeatsBelted(TestValues.GENERAL_SEATS_BELTED);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<SeatStatus> seatsBelted = msg.getSeatsBelted();
+        List<SeatStatus> seatsOccupied = msg.getSeatsOccupied();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATS_BELTED, seatsBelted);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATS_OCCUPIED, seatsOccupied);
+
+        // Invalid/Null Tests
+        SeatOccupancy msg = new SeatOccupancy();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getSeatsBelted());
+        assertNull(TestValues.NULL, msg.getSeatsOccupied());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SeatOccupancy.KEY_SEATS_OCCUPIED, TestValues.JSON_GENERAL_SEATS_OCCUPIED);
+            reference.put(SeatOccupancy.KEY_SEATS_BELTED, TestValues.JSON_GENERAL_SEATS_BELTED);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(SeatOccupancy.KEY_SEATS_OCCUPIED) || key.equals(SeatOccupancy.KEY_SEATS_BELTED)) {
+                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
+
+                    for (int i = 0; i < referenceArray.length(); i++) {
+                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+                        Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+                        assertTrue(TestValues.TRUE, Validator.validateSeatStatus(new SeatStatus(hashReference), new SeatStatus(hashTest)));
+                    }
+
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
+}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatStatusTests.java
new file mode 100644
index 000000000..dddf3b2c0
--- /dev/null
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatStatusTests.java
@@ -0,0 +1,76 @@
+package com.smartdevicelink.test.rpc.datatypes;
+
+import com.smartdevicelink.marshal.JsonRPCMarshaller;
+import com.smartdevicelink.proxy.rpc.SeatLocation;
+import com.smartdevicelink.proxy.rpc.SeatStatus;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.TestValues;
+import com.smartdevicelink.test.Validator;
+
+import junit.framework.TestCase;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+
+public class SeatStatusTests extends TestCase {
+
+    private SeatStatus msg;
+
+    @Override
+    public void setUp() {
+        msg = new SeatStatus();
+
+        msg.setSeatLocation(TestValues.GENERAL_SEAT_LOCATION);
+        msg.setConditionActive(TestValues.GENERAL_BOOLEAN);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        SeatLocation location = msg.getSeatLocation();
+        Boolean conditionActive = msg.getConditionActive();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SEAT_LOCATION, location);
+        assertEquals(TestValues.GENERAL_BOOLEAN, (boolean) conditionActive);
+
+        // Invalid/Null Tests
+        SeatStatus msg = new SeatStatus();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getSeatLocation());
+        assertNull(TestValues.NULL, msg.getConditionActive());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SeatStatus.KEY_CONDITION_ACTIVE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatStatus.KEY_SEAT_LOCATION, TestValues.GENERAL_SEAT_LOCATION.serializeJSON());
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(SeatStatus.KEY_SEAT_LOCATION)) {
+                    Hashtable<String, Object> locationOne = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(reference, key));
+                    Hashtable<String, Object> locationTwo = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key));
+                    assertTrue(TestValues.TRUE, Validator.validateSeatLocation(new SeatLocation(locationOne), new SeatLocation(locationTwo)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
+}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
index 0eb05f848..dad5ea3e2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
@@ -172,6 +172,8 @@ public class TextFieldNameTests extends TestCase {
         enumTestList.add(TextFieldName.locationDescription);
         enumTestList.add(TextFieldName.addressLines);
         enumTestList.add(TextFieldName.phoneNumber);
+        enumTestList.add(TextFieldName.timeToDestination);
+        enumTestList.add(TextFieldName.turnText);
         enumTestList.add(TextFieldName.templateTitle);
         enumTestList.add(TextFieldName.subtleAlertText1);
         enumTestList.add(TextFieldName.subtleAlertText2);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
index c6e748f9a..94fbe0100 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
@@ -92,6 +92,8 @@ public class VehicleDataTypeTests extends TestCase {
         VehicleDataType enumVehicleDataStabilityControlsStatus = VehicleDataType.valueForString(example);
         example = "VEHICLEDATA_CLIMATEDATA";
         VehicleDataType enumVehicleDataClimateData = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_SEATOCCUPANCY";
+        VehicleDataType enumVehicleDataSeatOccupancy = VehicleDataType.valueForString(example);
 
         assertNotNull("VEHICLEDATA_GPS returned null", enumVehicleDataGps);
         assertNotNull("VEHICLEDATA_SPEED returned null", enumVehicleDataSpeed);
@@ -130,6 +132,7 @@ public class VehicleDataTypeTests extends TestCase {
         assertNotNull("VEHICLEDATA_GEARSTATUS returned null", enumVehicleDataGearStatus);
         assertNotNull("VEHICLEDATA_STABILITYCONTROLSSTATUS returned null", enumVehicleDataStabilityControlsStatus);
         assertNotNull("VEHICLEDATA_CLIMATEDATA returned null", enumVehicleDataClimateData);
+        assertNotNull("VEHICLEDATA_SEATOCCUPANCY returned null", enumVehicleDataSeatOccupancy);
     }
 
     /**
@@ -202,6 +205,7 @@ public class VehicleDataTypeTests extends TestCase {
         enumTestList.add(VehicleDataType.VEHICLEDATA_GEARSTATUS);
         enumTestList.add(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS);
         enumTestList.add(VehicleDataType.VEHICLEDATA_CLIMATEDATA);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_SEATOCCUPANCY);
 
         assertTrue("Enum value list does not match enum class list",
                 enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index 40cc6e721..0710c79f5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
@@ -18,6 +18,7 @@ import com.smartdevicelink.proxy.rpc.GetVehicleDataResponse;
 import com.smartdevicelink.proxy.rpc.HeadLampStatus;
 import com.smartdevicelink.proxy.rpc.MyKey;
 import com.smartdevicelink.proxy.rpc.OnVehicleData;
+import com.smartdevicelink.proxy.rpc.SeatOccupancy;
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.StabilityControlsStatus;
 import com.smartdevicelink.proxy.rpc.TireStatus;
@@ -108,6 +109,7 @@ public class OnVehicleDataTests extends BaseRpcTests {
             result.put(OnVehicleData.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS);
             result.put(OnVehicleData.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST);
             result.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS);
+            result.put(OnVehicleData.KEY_SEAT_OCCUPANCY, VehicleDataHelper.SEAT_OCCUPANCY);
             result.put(OnVehicleData.KEY_CLIMATE_DATA, VehicleDataHelper.CLIMATE_DATA);
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
         } catch (JSONException e) {
@@ -158,6 +160,7 @@ public class OnVehicleDataTests extends BaseRpcTests {
         StabilityControlsStatus stabilityControlsStatus = ((OnVehicleData) msg).getStabilityControlsStatus();
         Object oemCustomVehicleData = ((OnVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
         Boolean handsOffSteering = ((OnVehicleData) msg).getHandsOffSteering();
+        SeatOccupancy seatOccupancy = ((OnVehicleData) msg).getSeatOccupancy();
         // Valid Tests
         assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, speed);
         assertEquals(TestValues.MATCH, VehicleDataHelper.RPM, rpm);
@@ -193,6 +196,7 @@ public class OnVehicleDataTests extends BaseRpcTests {
         assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, gearStatus);
         assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, stabilityControlsStatus);
         assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, oemCustomVehicleData);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.SEAT_OCCUPANCY, seatOccupancy);
         assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, handsOffSteering);
         // Invalid/Null Tests
         OnVehicleData msg = new OnVehicleData();
@@ -233,6 +237,7 @@ public class OnVehicleDataTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getGearStatus());
         assertNull(TestValues.NULL, msg.getClimateData());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
+        assertNull(TestValues.NULL, msg.getSeatOccupancy());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
 
@@ -257,6 +262,7 @@ public class OnVehicleDataTests extends BaseRpcTests {
         JSONObject gearStatusObj = new JSONObject();
         JSONObject stabilityControlStatusObj = new JSONObject();
         JSONObject climateDataObj = new JSONObject();
+        JSONObject seatOccupancyObj = new JSONObject();
         JSONArray fuelRangeArrayObj = new JSONArray();
         JSONArray windowStatusArrayObj = new JSONArray();
 
@@ -403,6 +409,10 @@ public class OnVehicleDataTests extends BaseRpcTests {
             gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE);
             gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR);
 
+            // SEAT OCCUPANCY
+            seatOccupancyObj.put(SeatOccupancy.KEY_SEATS_OCCUPIED, VehicleDataHelper.SEATS_OCCUPIED);
+            seatOccupancyObj.put(SeatOccupancy.KEY_SEATS_BELTED, VehicleDataHelper.SEATS_BELTED);
+
             reference.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED);
             reference.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM);
             reference.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
@@ -437,6 +447,7 @@ public class OnVehicleDataTests extends BaseRpcTests {
             reference.put(OnVehicleData.KEY_GEAR_STATUS, gearStatusObj);
             reference.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, stabilityControlStatusObj);
             reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
+            reference.put(OnVehicleData.KEY_SEAT_OCCUPANCY, seatOccupancyObj);
 
             // CLIMATE_DATA
             climateDataObj.put(ClimateData.KEY_ATMOSPHERIC_PRESSURE, VehicleDataHelper.CLIMATE_DATA_ATM_PRESSURE);
@@ -541,6 +552,14 @@ public class OnVehicleDataTests extends BaseRpcTests {
                     assertTrue(TestValues.TRUE, Validator.validateGearStatuses(
                             new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
                             new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
+                }
+                else if (key.equals(OnVehicleData.KEY_SEAT_OCCUPANCY)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateSeatOccupancies(
+                            new SeatOccupancy(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
+                            new SeatOccupancy(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
                 } else if (key.equals(OnVehicleData.KEY_ENGINE_OIL_LIFE)) {
                     assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key));
                 } else if (key.equals(OnVehicleData.KEY_HANDS_OFF_STEERING)) {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
index 12ecd6bf2..17f66e47c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
@@ -65,6 +65,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
         msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
         msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
         msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setSeatOccupancy(TestValues.GENERAL_BOOLEAN);
         msg.setClimateData(TestValues.GENERAL_BOOLEAN);
         msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
 
@@ -120,6 +121,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
             result.put(GetVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(GetVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(GetVehicleData.KEY_CLIMATE_DATA, TestValues.GENERAL_BOOLEAN);
+            result.put(GetVehicleData.KEY_SEAT_OCCUPANCY, TestValues.GENERAL_BOOLEAN);
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
         } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
@@ -168,6 +170,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
         assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getWindowStatus());
         assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getGearStatus());
         assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getStabilityControlsStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getSeatOccupancy());
         assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getClimateData());
         assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
 
@@ -210,6 +213,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getGearStatus());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getClimateData());
+        assertNull(TestValues.NULL, msg.getSeatOccupancy());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
 
@@ -265,6 +269,7 @@ public class GetVehicleDataTests extends BaseRpcTests {
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_SEAT_OCCUPANCY), cmd.getSeatOccupancy());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_CLIMATE_DATA), cmd.getClimateData());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
index a1c7f1b75..32750af89 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
@@ -63,6 +63,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
         msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
         msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
         msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setSeatOccupancy(TestValues.GENERAL_BOOLEAN);
         msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
         msg.setClimateData(TestValues.GENERAL_BOOLEAN);
         msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
@@ -118,6 +119,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
             result.put(SubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(SubscribeVehicleData.KEY_CLIMATE_DATA, TestValues.GENERAL_BOOLEAN);
+            result.put(SubscribeVehicleData.KEY_SEAT_OCCUPANCY, TestValues.GENERAL_BOOLEAN);
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
         } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
@@ -166,6 +168,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
         assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getGearStatus());
         assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getStabilityControlsStatus());
         assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getClimateData());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getSeatOccupancy());
         assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
 
         // Invalid/Null Tests
@@ -206,6 +209,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getGearStatus());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getClimateData());
+        assertNull(TestValues.NULL, msg.getSeatOccupancy());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
 
@@ -261,6 +265,7 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_CLIMATE_DATA), cmd.getClimateData());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_SEAT_OCCUPANCY), cmd.getSeatOccupancy());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
         } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
index fad3888ca..4aeb5ce66 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
@@ -67,6 +67,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
         msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
         msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
         msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setSeatOccupancy(TestValues.GENERAL_BOOLEAN);
         msg.setClimateData(TestValues.GENERAL_BOOLEAN);
         msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
 
@@ -121,6 +122,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
             result.put(UnsubscribeVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN);
+            result.put(UnsubscribeVehicleData.KEY_SEAT_OCCUPANCY, TestValues.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_CLIMATE_DATA, TestValues.GENERAL_BOOLEAN);
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
         } catch (JSONException e) {
@@ -170,6 +172,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
         assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getGearStatus());
         assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getStabilityControlsStatus());
         assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getClimateData());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getSeatOccupancy());
         assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
         // Invalid/Null Tests
         UnsubscribeVehicleData msg = new UnsubscribeVehicleData();
@@ -209,6 +212,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getWindowStatus());
         assertNull(TestValues.NULL, msg.getGearStatus());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
+        assertNull(TestValues.NULL, msg.getSeatOccupancy());
         assertNull(TestValues.NULL, msg.getClimateData());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
@@ -267,6 +271,7 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLIMATE_DATA), cmd.getClimateData());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_SEAT_OCCUPANCY), cmd.getSeatOccupancy());
             assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
 
         } catch (JSONException e) {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 49856ce68..8430fd728 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
@@ -17,6 +17,7 @@ import com.smartdevicelink.proxy.rpc.GearStatus;
 import com.smartdevicelink.proxy.rpc.GetVehicleDataResponse;
 import com.smartdevicelink.proxy.rpc.HeadLampStatus;
 import com.smartdevicelink.proxy.rpc.MyKey;
+import com.smartdevicelink.proxy.rpc.SeatOccupancy;
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.StabilityControlsStatus;
 import com.smartdevicelink.proxy.rpc.TireStatus;
@@ -107,6 +108,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
             result.put(GetVehicleDataResponse.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS);
             result.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS);
             result.put(GetVehicleDataResponse.KEY_CLIMATE_DATA, VehicleDataHelper.CLIMATE_DATA);
+            result.put(GetVehicleDataResponse.KEY_SEAT_OCCUPANCY, VehicleDataHelper.SEAT_OCCUPANCY);
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
         } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
@@ -135,6 +137,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
         JSONObject fuelRangeObj = new JSONObject();
         JSONObject windowStatusObj = new JSONObject();
         JSONObject gearStatusObj = new JSONObject();
+        JSONObject seatOccupancyObj = new JSONObject();
         JSONObject climateDataObj = new JSONObject();
         JSONArray fuelRangeArrayObj = new JSONArray();
         JSONArray windowStatusArrayObj = new JSONArray();
@@ -286,6 +289,10 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
             climateDataObj.put(ClimateData.KEY_CABIN_TEMPERATURE, VehicleDataHelper.CLIMATE_DATA_CABIN_TEMP.serializeJSON());
             climateDataObj.put(ClimateData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.CLIMATE_DATA_EXT_TEMP.serializeJSON());
 
+            // SEAT_OCCUPANCY
+            seatOccupancyObj.put(SeatOccupancy.KEY_SEATS_BELTED, VehicleDataHelper.SEATS_BELTED);
+            seatOccupancyObj.put(SeatOccupancy.KEY_SEATS_OCCUPIED, VehicleDataHelper.SEATS_OCCUPIED);
+
             reference.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED);
             reference.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM);
             reference.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
@@ -320,6 +327,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
             reference.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, windowStatusArrayObj);
             reference.put(GetVehicleDataResponse.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
             reference.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, stabilityControlsStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_SEAT_OCCUPANCY, seatOccupancyObj);
             reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
 
             JSONObject underTest = msg.serializeJSON();
@@ -433,6 +441,13 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
                     assertTrue(TestValues.TRUE, Validator.validateGearStatuses(
                             new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
                             new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_SEAT_OCCUPANCY)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateSeatOccupancies(
+                            new SeatOccupancy(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
+                            new SeatOccupancy(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
                 } else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) {
                     JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
                     JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
@@ -553,6 +568,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
         assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, ((GetVehicleDataResponse) msg).getHandsOffSteering());
         assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, ((GetVehicleDataResponse) msg).getStabilityControlsStatus());
         assertEquals(TestValues.MATCH, VehicleDataHelper.CLIMATE_DATA, ((GetVehicleDataResponse) msg).getClimateData());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.SEAT_OCCUPANCY, ((GetVehicleDataResponse) msg).getSeatOccupancy());
         assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, ((GetVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
 
         // Invalid/Null Tests
@@ -592,6 +608,7 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getWindowStatus());
         assertNull(TestValues.NULL, msg.getClimateData());
+        assertNull(TestValues.NULL, msg.getSeatOccupancy());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
 
@@ -685,6 +702,10 @@ public class GetVehicleDataResponseTests extends BaseRpcTests {
             GearStatus cmdStatus = cmd.getGearStatus();
             assertTrue(TestValues.TRUE, Validator.validateGearStatuses(gearStatus, cmdStatus));
 
+            JSONObject seatOccupancyObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_SEAT_OCCUPANCY);
+            SeatOccupancy seatOccupancy = new SeatOccupancy(JsonRPCMarshaller.deserializeJSONObject(seatOccupancyObj));
+            assertTrue(TestValues.TRUE, Validator.validateSeatOccupancies(seatOccupancy, cmd.getSeatOccupancy()));
+
             JSONObject myKeyObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_MY_KEY);
             MyKey myKey = new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObj));
             assertTrue(TestValues.TRUE, Validator.validateMyKey(myKey, cmd.getMyKey()));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
index 97ce9ab96..278a29b35 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
@@ -70,6 +70,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
         msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()));
         msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()));
         msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA);
+        msg.setSeatOccupancy(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SEATOCCUPANCY.ordinal()));
         msg.setClimateData(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLIMATEDATA.ordinal()));
 
         return msg;
@@ -130,6 +131,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
             result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON());
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON());
             result.put(SubscribeVehicleDataResponse.KEY_CLIMATE_DATA, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLIMATEDATA.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_SEAT_OCCUPANCY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SEATOCCUPANCY.ordinal()).serializeJSON());
 
         } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
@@ -179,6 +181,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
         VehicleDataResult testStabilityControlStatus = ((SubscribeVehicleDataResponse) msg).getStabilityControlsStatus();
         VehicleDataResult testClimateData = ((SubscribeVehicleDataResponse) msg).getClimateData();
         VehicleDataResult testOEMCustomVehicleData = ((SubscribeVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+        VehicleDataResult testSeatOccupancy = ((SubscribeVehicleDataResponse) msg).getSeatOccupancy();
 
         // Valid Tests
         assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT));
@@ -216,6 +219,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS));
         assertTrue(TestValues.TRUE, testOEMCustomVehicleData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
         assertTrue(TestValues.TRUE, testClimateData.getDataType().equals(VehicleDataType.VEHICLEDATA_CLIMATEDATA));
+        assertTrue(TestValues.TRUE, testSeatOccupancy.getDataType().equals(VehicleDataType.VEHICLEDATA_SEATOCCUPANCY));
 
         // Invalid/Null Tests
         SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse();
@@ -256,6 +260,7 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getGearStatus());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getClimateData());
+        assertNull(TestValues.NULL, msg.getSeatOccupancy());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
 
@@ -415,6 +420,10 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
             JSONObject oemCustomVehicleDataName = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
             VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomVehicleDataName));
             assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)));
+
+            JSONObject seatOccupancy = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_SEAT_OCCUPANCY);
+            VehicleDataResult referenceSeatOccupancy = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(seatOccupancy));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSeatOccupancy, cmd.getSeatOccupancy()));
         } catch (JSONException e) {
             e.printStackTrace();
         }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
index 8f10c875a..6169de07f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
@@ -70,6 +70,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
         msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()));
         msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()));
         msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()));
+        msg.setSeatOccupancy(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SEATOCCUPANCY.ordinal()));
         msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()));
         msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA);
         msg.setClimateData(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLIMATEDATA.ordinal()));
@@ -130,6 +131,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
             result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON());
             result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
             result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_SEAT_OCCUPANCY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SEATOCCUPANCY.ordinal()).serializeJSON());
             result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON());
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON());
             result.put(SubscribeVehicleDataResponse.KEY_CLIMATE_DATA, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLIMATEDATA.ordinal()).serializeJSON());
@@ -182,6 +184,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
         VehicleDataResult testStabilityControlStatus = ((UnsubscribeVehicleDataResponse) msg).getStabilityControlsStatus();
         VehicleDataResult testClimateData = ((UnsubscribeVehicleDataResponse) msg).getClimateData();
         VehicleDataResult testOemCustomData = ((UnsubscribeVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+        VehicleDataResult testSeatOccupancy = ((UnsubscribeVehicleDataResponse) msg).getSeatOccupancy();
 
         // Valid Tests
         assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT));
@@ -219,6 +222,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertTrue(TestValues.TRUE, testOemCustomData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
         assertTrue(TestValues.TRUE, testClimateData.getDataType().equals(VehicleDataType.VEHICLEDATA_CLIMATEDATA));
         assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS));
+        assertTrue(TestValues.TRUE, testSeatOccupancy.getDataType().equals(VehicleDataType.VEHICLEDATA_SEATOCCUPANCY));
 
         // Invalid/Null Tests
         UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse();
@@ -260,6 +264,7 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getHandsOffSteering());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getClimateData());
+        assertNull(TestValues.NULL, msg.getSeatOccupancy());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
 
@@ -419,6 +424,10 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
             JSONObject climateData = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_CLIMATE_DATA);
             VehicleDataResult referenceClimateData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(climateData));
             assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClimateData, cmd.getClimateData()));
+
+            JSONObject seatOccupancy = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_SEAT_OCCUPANCY);
+            VehicleDataResult referenceSeatOccupancy = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(seatOccupancy));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSeatOccupancy, cmd.getSeatOccupancy()));
         } catch (JSONException e) {
             e.printStackTrace();
         }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
index 588e8cd4f..b7744a3e3 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
@@ -282,6 +282,16 @@ import java.util.Hashtable;
  *              @since SmartDeviceLink 7.1.0

  *          </td>

  *      </tr>

+ *      <tr>

+ *          <td>seatOccupancy</td>

+ *          <td>Boolean</td>

+ *          <td>See SeatOccupancy</td>

+ *          <td>N</td>

+ *          <td></td>

+ *          <td>

+ *          @since SmartDeviceLink 7.1.0

+ *          </td>

+ *      </tr>

  * 		</table>

  *

  *

@@ -358,6 +368,10 @@ public class GetVehicleData extends RPCRequest {
     public static final String KEY_CLIMATE_DATA = "climateData";

 

     /**

+     * @since SmartDeviceLink 7.1.0

+     */

+    public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";

+    /**

      * Constructs a new GetVehicleData object

      */

 

@@ -851,4 +865,25 @@ public class GetVehicleData extends RPCRequest {
     public Boolean getClimateData() {

         return getBoolean(KEY_CLIMATE_DATA);

     }

+

+    /**

+     * Sets the seatOccupancy.

+     *

+     * @param seatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public GetVehicleData setSeatOccupancy(Boolean seatOccupancy) {

+        setParameters(KEY_SEAT_OCCUPANCY, seatOccupancy);

+        return this;

+    }

+

+    /**

+     * Gets the seatOccupancy.

+     *

+     * @return Boolean See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public Boolean getSeatOccupancy() {

+        return getBoolean(KEY_SEAT_OCCUPANCY);

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index 2a9dd5ffc..33ebf324f 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
@@ -107,6 +107,10 @@ public class GetVehicleDataResponse extends RPCResponse {
     public static final String KEY_CLIMATE_DATA = "climateData";

 

     /**

+     * @since SmartDeviceLink 7.1.0

+     */

+    public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";

+    /**

      * Constructs a new GetVehicleDataResponse object

      */

 

@@ -644,6 +648,24 @@ public class GetVehicleDataResponse extends RPCResponse {
     public ClimateData getClimateData() {

         return (ClimateData) getObject(ClimateData.class, KEY_CLIMATE_DATA);

     }

+    /**

+     * Sets the seatOccupancy.

+     *

+     * @param seatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public GetVehicleDataResponse setSeatOccupancy(SeatOccupancy seatOccupancy) {

+        setParameters(KEY_SEAT_OCCUPANCY, seatOccupancy);

+        return this;

+    }

 

+    /**

+     * Gets the seatOccupancy.

+     *

+     * @return SeatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public SeatOccupancy getSeatOccupancy() {

+        return (SeatOccupancy) getObject(SeatOccupancy.class, KEY_SEAT_OCCUPANCY);

+    }

 }

-

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 4adb7afae..8d87f6d30 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -336,6 +336,15 @@ import java.util.List;
  *          <td>N</td>

  *          <td>SmartDeviceLink 7.0.0</td>

  *  </tr>

+ *  <tr>

+ *          <td>seatOccupancy</td>

+ *          <td>SeatOccupancy</td>

+ *          <td>See SeatOccupancy</td>

+ *          <td>N</td>

+ *          <td></td>

+ *          <td>

+ *          @since SmartDeviceLink 7.1.0

+ *          </td>

  *  </table>

  *

  * @see SubscribeVehicleData

@@ -396,6 +405,10 @@ public class OnVehicleData extends RPCNotification {
 

     public static final String KEY_STABILITY_CONTROLS_STATUS = "stabilityControlsStatus";

 

+    /**

+     * @since SmartDeviceLink 7.1.0

+     */

+    public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";

     public OnVehicleData() {

         super(FunctionID.ON_VEHICLE_DATA.toString());

     }

@@ -910,4 +923,24 @@ public class OnVehicleData extends RPCNotification {
     public ClimateData getClimateData() {

         return (ClimateData) getObject(ClimateData.class, KEY_CLIMATE_DATA);

     }

+    /**

+     * Sets the seatOccupancy.

+     *

+     * @param seatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public OnVehicleData setSeatOccupancy(SeatOccupancy seatOccupancy) {

+        setParameters(KEY_SEAT_OCCUPANCY, seatOccupancy);

+        return this;

+    }

+

+    /**

+     * Gets the seatOccupancy.

+     *

+     * @return SeatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public SeatOccupancy getSeatOccupancy() {

+        return (SeatOccupancy) getObject(SeatOccupancy.class, KEY_SEAT_OCCUPANCY);

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatOccupancy.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatOccupancy.java
new file mode 100644
index 000000000..c54ae0ef0
--- /dev/null
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatOccupancy.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2017 - 2020, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.smartdevicelink.proxy.rpc;
+
+import com.smartdevicelink.proxy.RPCStruct;
+
+import java.util.Hashtable;
+import java.util.List;
+
+/**
+ *
+ * <p><b>Parameter List</b></p>
+ *
+ * <table border="1" rules="all">
+ *  <tr>
+ *      <th>Param Name</th>
+ *      <th>Type</th>
+ *      <th>Description</th>
+ *      <th>Required</th>
+ *      <th>Notes</th>
+ *      <th>Version Available</th>
+ *  </tr>
+ *  <tr>
+ *      <td>seatsOccupied</td>
+ *      <td>List<SeatStatus></td>
+ *      <td>Seat status array containing location and whether the seats are occupied.</td>
+ *      <td>N</td>
+ *      <td>{"array_min_size": 0, "array_max_size": 100}</td>
+ *      <td></td>
+ *  </tr>
+ *  <tr>
+ *      <td>seatsBelted</td>
+ *      <td>List<SeatStatus></td>
+ *      <td>Seat status array containing location and whether the seats are belted.</td>
+ *      <td>N</td>
+ *      <td>{"array_min_size": 0, "array_max_size": 100}</td>
+ *      <td></td>
+ *  </tr>
+ * </table>
+ * @since SmartDeviceLink 7.1.0
+ */
+public class SeatOccupancy extends RPCStruct {
+    public static final String KEY_SEATS_OCCUPIED = "seatsOccupied";
+    public static final String KEY_SEATS_BELTED = "seatsBelted";
+
+    /**
+     * Constructs a new SeatOccupancy object
+     */
+    public SeatOccupancy() { }
+
+    /**
+     * Constructs a new SeatOccupancy object indicated by the Hashtable parameter
+     *
+     * @param hash The Hashtable to use
+     */
+    public SeatOccupancy(Hashtable<String, Object> hash) {
+        super(hash);
+    }
+
+    /**
+     * Sets the seatsOccupied.
+     *
+     * @param seatsOccupied Seat status array containing location and whether the seats are occupied.
+     * {"array_min_size": 0, "array_max_size": 100}
+     */
+    public SeatOccupancy setSeatsOccupied(List<SeatStatus> seatsOccupied) {
+        setValue(KEY_SEATS_OCCUPIED, seatsOccupied);
+        return this;
+    }
+
+    /**
+     * Gets the seatsOccupied.
+     *
+     * @return List<SeatStatus> Seat status array containing location and whether the seats are occupied.
+     * {"array_min_size": 0, "array_max_size": 100}
+     */
+    @SuppressWarnings("unchecked")
+    public List<SeatStatus> getSeatsOccupied() {
+        return (List<SeatStatus>) getObject(SeatStatus.class, KEY_SEATS_OCCUPIED);
+    }
+
+    /**
+     * Sets the seatsBelted.
+     *
+     * @param seatsBelted Seat status array containing location and whether the seats are belted.
+     * {"array_min_size": 0, "array_max_size": 100}
+     */
+    public SeatOccupancy setSeatsBelted(List<SeatStatus> seatsBelted) {
+        setValue(KEY_SEATS_BELTED, seatsBelted);
+        return this;
+    }
+
+    /**
+     * Gets the seatsBelted.
+     *
+     * @return List<SeatStatus> Seat status array containing location and whether the seats are belted.
+     * {"array_min_size": 0, "array_max_size": 100}
+     */
+    @SuppressWarnings("unchecked")
+    public List<SeatStatus> getSeatsBelted() {
+        return (List<SeatStatus>) getObject(SeatStatus.class, KEY_SEATS_BELTED);
+    }
+}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatStatus.java
new file mode 100644
index 000000000..65f60c8ff
--- /dev/null
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SeatStatus.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2017 - 2020, SmartDeviceLink Consortium, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the SmartDeviceLink Consortium Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.smartdevicelink.proxy.rpc;
+
+import androidx.annotation.NonNull;
+
+import com.smartdevicelink.proxy.RPCStruct;
+
+import java.util.Hashtable;
+
+/**
+ * Describes the status of a parameter of seat.
+ *
+ * <p><b>Parameter List</b></p>
+ *
+ * <table border="1" rules="all">
+ *  <tr>
+ *      <th>Param Name</th>
+ *      <th>Type</th>
+ *      <th>Description</th>
+ *      <th>Required</th>
+ *      <th>Notes</th>
+ *      <th>Version Available</th>
+ *  </tr>
+ *  <tr>
+ *      <td>seatLocation</td>
+ *      <td>SeatLocation</td>
+ *      <td></td>
+ *      <td>Y</td>
+ *      <td></td>
+ *      <td></td>
+ *  </tr>
+ *  <tr>
+ *      <td>conditionActive</td>
+ *      <td>Boolean</td>
+ *      <td></td>
+ *      <td>Y</td>
+ *      <td></td>
+ *      <td></td>
+ *  </tr>
+ * </table>
+ *
+ * @since SmartDeviceLink 7.1.0
+ */
+public class SeatStatus extends RPCStruct {
+    public static final String KEY_SEAT_LOCATION = "seatLocation";
+    public static final String KEY_CONDITION_ACTIVE = "conditionActive";
+
+    /**
+     * Constructs a new SeatStatus object
+     */
+    public SeatStatus() { }
+
+    /**
+     * Constructs a new SeatStatus object indicated by the Hashtable parameter
+     *
+     * @param hash The Hashtable to use
+     */
+    public SeatStatus(Hashtable<String, Object> hash) {
+        super(hash);
+    }
+
+    /**
+     * Constructs a new SeatStatus object
+     *
+     * @param seatLocation
+     * @param conditionActive
+     */
+    public SeatStatus(@NonNull SeatLocation seatLocation, @NonNull Boolean conditionActive) {
+        this();
+        setSeatLocation(seatLocation);
+        setConditionActive(conditionActive);
+    }
+
+    /**
+     * Sets the seatLocation.
+     *
+     * @param seatLocation
+     */
+    public SeatStatus setSeatLocation(@NonNull SeatLocation seatLocation) {
+        setValue(KEY_SEAT_LOCATION, seatLocation);
+        return this;
+    }
+
+    /**
+     * Gets the seatLocation.
+     *
+     * @return SeatLocation
+     */
+    public SeatLocation getSeatLocation() {
+        return (SeatLocation) getObject(SeatLocation.class, KEY_SEAT_LOCATION);
+    }
+
+    /**
+     * Sets the conditionActive.
+     *
+     * @param conditionActive
+     */
+    public SeatStatus setConditionActive(@NonNull Boolean conditionActive) {
+        setValue(KEY_CONDITION_ACTIVE, conditionActive);
+        return this;
+    }
+
+    /**
+     * Gets the conditionActive.
+     *
+     * @return Boolean
+     */
+    public Boolean getConditionActive() {
+        return getBoolean(KEY_CONDITION_ACTIVE);
+    }
+}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
index 29c7e3848..7ea19c858 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
@@ -321,6 +321,16 @@ import java.util.Hashtable;
  *              @since SmartDeviceLink 7.1.0

  *          </td>

  *      </tr>

+ * 		<tr>

+ * 		    <td>seatOccupancy</td>

+ * 		    <td>Boolean</td>

+ * 		    <td>See SeatOccupancy</td>

+ * 		    <td>N</td>

+ * 		    <td></td>

+ * 		    <td>

+ * 		    @since SmartDeviceLink 7.1.0

+ * 		    </td>

+ * 		</tr>

  *   </table>

  *

  * <p> <b>Response</b></p>

@@ -391,6 +401,10 @@ public class SubscribeVehicleData extends RPCRequest {
      * @since SmartDeviceLink 7.1.0

      */

     public static final String KEY_CLIMATE_DATA = "climateData";

+    /**

+     * @since SmartDeviceLink 7.1.0

+     */

+    public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";

 

     /**

      * Constructs a new SubscribeVehicleData object

@@ -1075,4 +1089,25 @@ public class SubscribeVehicleData extends RPCRequest {
     public Boolean getClimateData() {

         return getBoolean(KEY_CLIMATE_DATA);

     }

+

+    /**

+     * Sets the seatOccupancy.

+     *

+     * @param seatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public SubscribeVehicleData setSeatOccupancy(Boolean seatOccupancy) {

+        setParameters(KEY_SEAT_OCCUPANCY, seatOccupancy);

+        return this;

+    }

+

+    /**

+     * Gets the seatOccupancy.

+     *

+     * @return Boolean See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public Boolean getSeatOccupancy() {

+        return getBoolean(KEY_SEAT_OCCUPANCY);

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
index 4abf950be..7a268f0f3 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
@@ -99,6 +99,10 @@ public class SubscribeVehicleDataResponse extends RPCResponse {
     public static final String KEY_CLIMATE_DATA = "climateData";

 

     /**

+     * @since SmartDeviceLink 7.1.0

+     */

+    public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";

+    /**

      * Constructs a new SubscribeVehicleDataResponse object

      */

     public SubscribeVehicleDataResponse() {

@@ -790,4 +794,25 @@ public class SubscribeVehicleDataResponse extends RPCResponse {
     public VehicleDataResult getClimateData() {

         return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLIMATE_DATA);

     }

+

+    /**

+     * Sets the seatOccupancy.

+     *

+     * @param seatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public SubscribeVehicleDataResponse setSeatOccupancy(VehicleDataResult seatOccupancy) {

+        setParameters(KEY_SEAT_OCCUPANCY, seatOccupancy);

+        return this;

+    }

+

+    /**

+     * Gets the seatOccupancy.

+     *

+     * @return VehicleDataResult See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public VehicleDataResult getSeatOccupancy() {

+        return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SEAT_OCCUPANCY);

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
index ac2dede47..e607711d0 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
@@ -308,6 +308,16 @@ import java.util.Hashtable;
  *              @since SmartDeviceLink 7.1.0

  *          </td>

  *      </tr>

+ *    	<tr>

+ *        	<td>seatOccupancy</td>

+ *        	<td>Boolean</td>

+ *        	<td>See SeatOccupancy</td>

+ *        	<td>N</td>

+ *        	<td></td>

+ *        	<td>

+ *        	@since SmartDeviceLink 7.1.0

+ *        	</td>

+ *    	</tr>

  *

  *

  *  </table>

@@ -377,6 +387,10 @@ public class UnsubscribeVehicleData extends RPCRequest {
     /**

      * @since SmartDeviceLink 7.1.0

      */

+    public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";

+    /**

+     * @since SmartDeviceLink 7.1.0

+     */

     public static final String KEY_CLIMATE_DATA = "climateData";

 

     /**

@@ -1064,4 +1078,25 @@ public class UnsubscribeVehicleData extends RPCRequest {
     public Boolean getClimateData() {

         return getBoolean(KEY_CLIMATE_DATA);

     }

+

+    /**

+     * Sets the seatOccupancy.

+     *

+     * @param seatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public UnsubscribeVehicleData setSeatOccupancy(Boolean seatOccupancy) {

+        setParameters(KEY_SEAT_OCCUPANCY, seatOccupancy);

+        return this;

+    }

+

+    /**

+     * Gets the seatOccupancy.

+     *

+     * @return Boolean See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public Boolean getSeatOccupancy() {

+        return getBoolean(KEY_SEAT_OCCUPANCY);

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
index a0fb0f4b6..114a1971a 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
@@ -99,6 +99,10 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
     public static final String KEY_CLIMATE_DATA = "climateData";

 

     /**

+     * @since SmartDeviceLink 7.1.0

+     */

+    public static final String KEY_SEAT_OCCUPANCY = "seatOccupancy";

+    /**

      * Constructs a new UnsubscribeVehicleDataResponse object

      */

     public UnsubscribeVehicleDataResponse() {

@@ -791,4 +795,25 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
     public VehicleDataResult getClimateData() {

         return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_CLIMATE_DATA);

     }

+

+    /**

+     * Sets the seatOccupancy.

+     *

+     * @param seatOccupancy See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public UnsubscribeVehicleDataResponse setSeatOccupancy(VehicleDataResult seatOccupancy) {

+        setParameters(KEY_SEAT_OCCUPANCY, seatOccupancy);

+        return this;

+    }

+

+    /**

+     * Gets the seatOccupancy.

+     *

+     * @return VehicleDataResult See SeatOccupancy

+     * @since SmartDeviceLink 7.1.0

+     */

+    public VehicleDataResult getSeatOccupancy() {

+        return (VehicleDataResult) getObject(VehicleDataResult.class, KEY_SEAT_OCCUPANCY);

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
index 1c749cc7f..6b07a2f9b 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/TextFieldName.java
@@ -185,6 +185,18 @@ public enum TextFieldName {
      */

     phoneNumber,

     /**

+     * Optional time to destination field for ShowConstantTBT

+     *

+     * @since SmartDeviceLink 7.1.0

+     */

+    timeToDestination,

+    /**

+     * Turn text for turnList parameter of UpdateTurnList

+     *

+     * @since SmartDeviceLink 7.1.0

+     */

+    turnText,

+    /**

      * Optional title of the template that will be displayed

      *

      * @since SmartDeviceLink 6.0

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
index 3f59397cf..ad619e46a 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VehicleDataType.java
@@ -190,7 +190,11 @@ public enum VehicleDataType {
     /**

      * @since SmartDeviceLink 7.0.0

      */

-    VEHICLEDATA_GEARSTATUS;

+    VEHICLEDATA_GEARSTATUS,

+     /**

+     * @since SmartDeviceLink 7.1.0

+     */

+    VEHICLEDATA_SEATOCCUPANCY;

 

     /**

      * Convert String to VehicleDataType