Core: Map methods should return immutable collections

Core: Map methods should return immutable collections #20696