Merge stable release 3 into main

Looks like there were a couple of commits that didn't make it into main for some reason.