am 30ca089e: Merge "Tweaks for forward compatibility"

* commit '30ca089e04a091c4eea95d62185d120a61f0e0ba':
  Tweaks for forward compatibility