diff --git a/_addons_bindings/gree/readme.md b/_addons_bindings/gree/readme.md
index a11e12f25..e8820e189 100644
--- a/_addons_bindings/gree/readme.md
+++ b/_addons_bindings/gree/readme.md
@@ -36,19 +36,13 @@ No binding configuration is required.
 
 ## Thing Configuration
 
-| Channel Name             | Type            | Description                                                                                   |
-|--------------------------|-----------------|-----------------------------------------------------------------------------------------------|
-| ipAddress                | IP Address      | IP address of the unit.                                                                       |
-| broadcastAddress         | IP Address      | Broadcast address being used for discovery, usually derived from the IP interface address.    |
-| refresh                  | Integer         | Refresh interval in seconds for polling the device status.                                    |
-| currentTemperatureOffset | Decimal         | Offset in Celsius for the current temperature value received from the device.                 |
-| encryptionType           | EncryptionTypes | Encryption type (ECB or GCM) used for communicating with the AC device                        |
-
-The Air Conditioner's IP address is mandatory, all other parameters are optional.
-If the broadcast is not set (default) it will be derived from openHAB's network setting (Check Network Settings in the openHAB UI).
-The binding tries to automatically detect the encryption type when communicating with the AC.
-If this fails, you might need need to set the encryption type manually.
-Only change this if you have a good reason to.
+| Parameter          | Parameter ID             | Required | Default | Description  |
+|--------------------|--------------------------|----------|---------|--------------|
+| IP Address         | ipAddress                | yes      |         | IP address of the unit. |
+| Broadcast Address  | broadcastAddress         | no       |         | Broadcast address being used for discovery, usually derived from the IP interface address. If the broadcast is not set (default) it will be derived from openHAB's network setting (Check Network Settings in the openHAB UI). |
+| Refresh Interval   | refreshInterval          | no       | 60      | Refresh interval in seconds for polling the device status. |
+| Offset Temperature | currentTemperatureOffset | no       | 0       | Offset in Celsius for the current temperature value received from the device. |
+| Encryption Type    | encryptionType           | no       | ECB     | Encryption type used for communicating with the AC device. Options: ECB (firmware version < 1.23), COMBINED (firmware version >= 1.23 - use ECB for decoding the scan responce and GCM for further encryption and decryption) and GCM (used by the latest devices). The binding tries to automatically detect the encryption type, in case it fails, you might need to set the encryption type manually. Only change this if you have a good reason to. |
 
 ## Channels
 
@@ -84,7 +78,7 @@ When changing mode, the air conditioner will be turned on unless "off" is select
 ### Things
 
 ```java
-Thing gree:airconditioner:a1234561 [ ipAddress="192.168.1.111", refresh=2, encryptionType="ECB" ]
+Thing gree:airconditioner:a1234561 [ ipAddress="192.168.1.111", refreshInterval=2, encryptionType="ECB" ]
 ```
 
 ### Items
diff --git a/_addons_bindings/plex/readme.md b/_addons_bindings/plex/readme.md
index b6aca7bea..5697926f8 100644
--- a/_addons_bindings/plex/readme.md
+++ b/_addons_bindings/plex/readme.md
@@ -135,6 +135,7 @@ The PLEX Player supports the following channels:
 | ratingKey            | String   | RO         | The unique key in the Plex library identifying the media that is playing                                         |
 | parentRatingKey      | String   | RO         | The unique key in the Plex library identifying the parent (TV show season or album) of the media that is playing |
 | grandparentRatingKey | String   | RO         | The unique key in the Plex library identifying the grandparent (TV show) of the media that is playing            |
+| user                 | String   | RO         | The user title                                                          |
 
 ## Full Example
 
diff --git a/_thing_types/org.openhab.binding.gree/src/main/resources/OH-INF/thing/thing-types.xml b/_thing_types/org.openhab.binding.gree/src/main/resources/OH-INF/thing/thing-types.xml
index 8fc6b30be..3dbf159a4 100644
--- a/_thing_types/org.openhab.binding.gree/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.gree/src/main/resources/OH-INF/thing/thing-types.xml
@@ -31,7 +31,7 @@
 			<parameter name="broadcastAddress" type="text" required="false">
 				<context>network-address</context>
 			</parameter>
-			<parameter name="refresh" type="integer" required="true" unit="s">
+			<parameter name="refreshInterval" type="integer" required="true" unit="s">
 				<default>60</default>
 				<unitLabel>seconds</unitLabel>
 				<advanced>true</advanced>
@@ -42,11 +42,13 @@
 				<advanced>true</advanced>
 			</parameter>
 			<parameter name="encryptionType" type="text">
+				<advanced>true</advanced>
 				<options>
+					<option value="UNKNOWN">@text/thing-type.config.gree.airconditioner.encryptionType.state.option.UNKNOWN</option>
 					<option value="ECB">@text/thing-type.config.gree.airconditioner.encryptionType.state.option.ECB</option>
+					<option value="COMBINED">@text/thing-type.config.gree.airconditioner.encryptionType.state.option.COMBINED</option>
 					<option value="GCM">@text/thing-type.config.gree.airconditioner.encryptionType.state.option.GCM</option>
 				</options>
-				<advanced>true</advanced>
 			</parameter>
 		</config-description>