bug #23715