I8 lazy load fix from Zack
Merge branch 'qa-testing' into gh-pages