am 910cf83c: Merge "tweak for forward-compatibility"

* commit '910cf83c9a58e4ee42b6aea919de80273cb25aa4':
  tweak for forward-compatibility