am c8871a40: Merge "Tweaks for forward-compatibility"

* commit 'c8871a4082a8e9cc59daf8e649688acd2b150fcd':
  Tweaks for forward-compatibility