bug #24046