bug #22861