Issue #3361907 by tBKoT: Use Address 2.x

Closes #3361907

added 2 commits

• ea086d39 - 1 commit from branch project:8.x-2.x
• 949a85ac - Issue #3361907 by tBKoT: Use Address 2.x

Compare with previous version

added 1 commit

• b697409a - Fix tests

Compare with previous version

added 3 commits

• e79c3fee - 1 commit from branch project:8.x-2.x
• 99fc7958 - Issue #3361907 by tBKoT: Use Address 2.x
• d0a96930 - Fix tests

Compare with previous version