Commented out test device IDs
Merge remote-tracking branch 'origin/Development'