chore(release): Merge branch '1.9' into 1.10

Possibly replaces #7681
Same with these two lines