issue #20734: Get issue all basically working.