am 989d50bd: (-s ours) DO NOT MERGE - Avoid re-use of orphaned data

* commit '989d50bd95b45755adc09facdf53e4218cf10077':
  DO NOT MERGE - Avoid re-use of orphaned data