Merge branch 'fix-auto-link-for-profile-fields' into 'develop'