Merge with jb_mr1_chocolate and Modified