merge 6.1.F.0.117