Merge "Update BackupEligibilityRules" into sc-dev