Issue #21587: Added address information