Fixes DEVELOPER-412