Adding eagerload support
Merge branch 'release/2.0.5'