Patch extra lazy map

Testcase and patch proposal for HHH-4294