Incorporating from nitro2client

Incorporated changes from nitro2client for MultiMapHashMap