merged 23.0.1.A.5.77 (fix2)