xci: Enable post merge promotion for generic scenarios