Fixes
Revert "Set subscription_mode in the database to a default value"

This reverts commit 2e8d1ecaee7f5972a52b20838b56276d75234343.
Merge remote-tracking branch 'upstream/jb3' into jb3