bug #23934