Proper fix for modules lazyloader
Proper fix for modules lazyloader
Merge branch 'tfix2' into develop