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

* commit 'da7c58ec790c867e2f7bf40af4c05438eba89d4a':
  version up to R4