Update for binary incompatibility introduced for CE5, restict to CM5+, CDH4+