Patch extra lazy map

Testcase and patch proposal for HHH-4294
(Please ignore the commit for  HHH-8154, it belonds to another pull request).