API-130 Added user unified errror codes
Merge branch 'develop'