Sync fork with upstream/main (post-#1561, 6 commits)

Sync fork with upstream/main (post-#1561, 6 commits) #170