bug #23414 and #24039