MAPTP got left behind

Bringing things left out of 3.1.2 merge back to speed.