Merge "Constrained allowable backup versions"