WIP: Merge __apt_pin fixes in 6.9 to master #336

Draft
fancsali wants to merge 4 commits from 6.9 into master

4 Commits