Merge branch 'develop' into cleanup/drop-subscription-table-if-exists