updated for jb-mr1.1-release