am d7007cd4: Merge "Forward compatibility patch."

* commit 'd7007cd4bb2016a09ae8e8f746118f81fdd27f02':
  Forward compatibility patch.