Fixes DEVELOPER-840 and Fixes DEVELOPER-856