[OE-3410] no address behaviour changes