Merge branch 'rmehta-backup-cleanup' into develop