am 0c30ba13: Merge "improve compatibility"

* commit '0c30ba1342318e73197db7dd52dcca4b6d4bf06d':
  improve compatibility