GH-4194: Adds additional address check

[radulovicn]

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 2 committers have signed the CLA.

:x: psmul
:x: radulovicn
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[giancorderoortiz]

Closing due to many months of inactivity. If still relevant, please update PR with latest develop branch, and re-open with meaningful comments so that it can be evaluated by development team.