Fixes DEVELOPER-515

Also contains the parallel fixes, and experimental fixes in aweplug
Merge pull request #339 from LightGuard/DEVELOPER-515

Fixes DEVELOPER-515