fix on profile edit
Merge branch 'master' into platform