am b687ff9f: Merge "Fix mismatched delete/new couple"

* commit 'b687ff9f2e02790e8a8e3964cb73e87546cd72dd':
  Fix mismatched delete/new couple