Changes to avoid copying of Match Policy structure.