Merge branch 'profile-directory' into 'develop'