am 980a59b4: Forward compatibility

* commit '980a59b45dd210d2c2d0d9e61d48899af2d1099f':
  Forward compatibility