May need to parse devices differently in REST.
Merge remote-tracking branch 'origin/master'