Pull address_range into release branch