Merge branch 'RobertSchouten-pref_email' into develop