bug #23724