am 6b1b3194: am 0c30ba13: Merge "improve compatibility"

* commit '6b1b3194b7bab8803a68436620beab7a8c1100fa':
  improve compatibility