merge caf/jb_mr1_chocolate