Merge "Fix some destroy bugs" into jb-mr1-dev