Fix user profile update
Merge branch 'dev' into hybrid