PMO-2443: fix clash with ContractBasedOn