Device validation
Merge remote-tracking branch 'origin/wso2dep' into wso2dep