Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev