^ Updated addressint field (from v2.3.0 branch)