Merge jb_mr1_chocolate changes