Merge pull request #3163 from ajyey/feature/disable-max-backup-size

Merge pull request #3163 from ajyey/feature/disable-max-backup-size #140