bug #23718