Backports

2 changes merged into main within a year wait for a backport. 2 have their backports in review.