Merge "Add a generic method for backup creation"