Merge branch 'feature/788-separate-email-addresses' into 'develop'