Code clean for user remote API
Code clean for user remote API
Merge branch 'develop' into media