Merge "Fix deoptimization bugs" into lmp-mr1-dev