[4.x]: After upgrade to v4 with craft upgrade command, addresses are not transferred/saved correctly & consistently

[4.x]: After upgrade to v4 with craft upgrade command, addresses are not transferred/saved correctly & consistently #91