Merge from jb-mr1.1-dev