Merge branch 'dev' into update-design-subscriptions