Fixed subscription clean up when using external subs
Merge branch 'master' into 2.6.0