Merge pull request #6063 from Zeranoe/fix-address-validator