Eager Loading of non required but conditionable

Fixes #1614