Merge changes from topic 'multimap-cleanup'

* changes:
  Avoid Multimap implementation create methods
  Prefer subtypes of Multimap