Merge "IQtiMapperExtensions: Change marking from file types.hal"