Submitted merge requests here https://salsa.debian.org/installer-team/apt-setup/-/merge_requests/14 and here https://salsa.debian.org/installer-team/apt-setup/-/merge_requests/15