bug #23491