am 336ea45d: Forward-compatibility

* commit '336ea45df77ba79946b0fa0232faf552e3bdac6d':
  Forward-compatibility