Fixes issues 3883 and 5194
7 files changed