This commit uses an EntrySet instead of looping over the keys and retrieving the value in a separate call. Issue: SPR-12356