merge from jb-mr1
merge from jb-mr1