am 6639985f: Merge "Fix test 087 for interpreter"

* commit '6639985f39a1983494fc7de2e4639fdc88e81228':
  Fix test 087 for interpreter