Ensure Persona lazyloads when required
Merge pull request #1948 from darkwing/persona-lazyload

Ensure Persona lazyloads when required