[IOT-1785] Merge branch 'iot-1785'