=str #16349 fix map + map optimization
Merge pull request #16349 from 2m/wip-16349-fix-map-map-optimization

=str #16349 fix map + map optimization