Merge "Fix divergence between interpreter and compiler."