Fixes for subscription merge release cases