First import of complete user APIs
Merge remote-tracking branch 'upstream/develop'