Fixes DEVELOPER-515