UCP changes specific to IRMUG needs, not useful for others