BS-8676: start modification to use new EMF Compare API