Fix: DATA-2246
Backport fixes to 6.4.1
Fix: OS-393
Fix: DATA-2245
Merge pull request #165 from ctrueden/patch-1
Fix: DATA-2244