sync: Updated to jb_mr1_chocolate