merge in nyc-iot-release history after reset to nyc-iot-dev