Revert "Revert "MMAPS upgrade""

This reverts commit 302931def51d7f2afcfeb2d8fd7f48f4f11c874f.