Add "Lazy" Lookup support
Merge commit 'a24fe632e210646d21a90a687b50decd3e142804'
Fixed linting after integration of lazy-lookup