Fixes for subscription merge release cases

No match.