am cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev

* commit 'cb5d644fb8956962b6a89f8d384b16819af5fdf9':
  Workaround possible use after delete