Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'