Merge pull request #2123 from devoncarew/device_commands

additional validation for device commands