bug #23921