Merge pull request #15997 from rohitwaghchaure/address_not_set_from_api

[Fix] Address not set from the API