Merge "Update saving persistent state documentation" into sc-dev