Thank you for the reply..
It seems that mapEntity() and primaryKeyedMapEntity() now returns Map instance, so it makes sense that we only use mapAttribute() that works on Map instance.
So my assumption is that mapAttribute() is now usable for normal map, entity map, and also keyed entity map.