fixed n+1 query warning
merge conflict
Merge branch 'release-lizzie'
Merge branch 'master' into release-lizzie