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