am d65fc9c4: (-s ours) am d8b47855: save "retain loader" state DO NOT MERGE

* commit 'd65fc9c4601f3fc5617ff0f72fcdb56581f0f223':
  save "retain loader" state DO NOT MERGE