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