2.063 compatibility by unrolling .map
Merge branch '2063-compat'