Fixes DEVELOPER-853