Fixes DEVELOPER-239
Fixes DEVELOPER-286
Fixes DEVELOPER-207