Merge "MAP : Add support for MAP 1.4"