Merge pull request #4355 from RemiNV/legacymap