! Assorted merge-related fixes

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2594 from Oldiesmann/release-2.1

! Assorted merge-related fixes