bug #23714