Merge branch 'master' into iot-1785