Edit profile data loss bug fixed
Merge branch 'origin/dev'