issue #19550: First pass bug fixing.