Comment 6 for bug 1959405

Thanks, Garry and Terran! I've merged this to rel_3_7, rel_3_8, and master for 3.9. While merging, I squashed the two commits into one, adjusted the commit message to reflect that fact, and fixed one typo in the bug number.