Merge branch 'feature/email-field-popup' into develop