Included dirty fix for 'too many topics' issue with backups