[#BB2] commit6 from GH