Sprint 4 bug fixes, part 2

I want to add a few more commits here, but am opening the PR now in order to respond to email/forum posts.

Fixes for tickets #10040 and #10088 will be added in the next couple of days.