Fixes DEVELOPER-515

Also contains the parallel fixes, and experimental fixes in aweplug