issue #20734: Get issue line and return line working. Lots of refinements.