Temporarily fix signalR device mapping.
Merge branch 'signalRfix'