Fixes #3761 Fixes #3836 Fixes #3841
Many thanks to Bob Droog for organizing a test account and extensive testing.