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

* commit 'd4fa235e3c474cd4ecc3aa7663dd72d76b9d478d':
  version up to R4