Fixes #2663 but needs to wait till issue #2692 is resolved
Resolved merge problems + checkstyle issue
Minor test tweak
Added javadoc on field
Merge pull request #2700 from pveentjer/performance/3.x/2663-mapentries

Fixes #2663