bug #24047