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