SI-7005 Map#mapValues is not serializable

Fixes SI-7005