Merge branch 'user_api'