Merge "Move match converter to new converter system"