Merge "Fix test 087 for interpreter"