3.x upgrade vs. tax-pkg_address, #30413