CSPACE-5678-D: Adding more support for backward compat with old merging model.