Fix wrong reference
Merge branch 'master' into subscriptions