am d8b47855: save "retain loader" state DO NOT MERGE

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