issue #22155: Finish address related problems.