Support v3 and v4 eager load logic, #1791
Merge pull request #1830 from mperham/eager_load

Support v3 and v4 eager load logic, #1791