0.6.14: Make it possible to optimize n+1 queries for primary_email_address