CLDIDE-1952: rework workflow of addition of subscription