am e95136a8: DO NOT MERGE - Avoid re-use of orphaned data

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