Merge branch 'feature/compat/push-subscriptions' into 'develop'