am 03e7ec95: Merge "Tweaks for forward-compatibility"

* commit '03e7ec959823279937ceae1290b938c4b0b68317':
  Tweaks for forward-compatibility