load lazy models only when they have a session
Merge branch 'fix-lazy-models'