Added new function
Testdev changes
Merge remote-tracking branch 'origin/ericdev'
Fixed Merge conflict