bug #23704