am 5158006b: am d4fa235e: Merge "version up to R4" into jb-mr1.1-dev

* commit '5158006be49683d3dc87a8266d5b744b7e0a88a0':
  version up to R4