am 20cdc069: Merge "Changes for vogar compatibility"

* commit '20cdc069f06f34828e51bcf89597bebe5df445d5':
  Changes for vogar compatibility