[#38708827][#20019529] Add address field on create/update in Client
Merge pull request #26 from jamesiarmes/merge-with-master

[SPRINTFIX][#38708827 #20019529] Add address field on create/update in Client