Fixes DEVELOPER-752 and DEVELOPER-747