bef merge 7.02