Merging branch lazy

lazy support is required to fix resolve
Fixing resolve by relying on lazy evaluation