merge fix 23967