Merge "Dynamic Sensor Discovery implementation"