Merge branch '1526-account-aliases' into 'develop'