DO NOT MERGE. Use resolved path when inserting and deleting.
am: 600d3afcc3

* commit '600d3afcc3cbe2a9c3f44eda66bec806709c20e8':
  DO NOT MERGE. Use resolved path when inserting and deleting.