Fixes DEVELOPER-840 and Fixes DEVELOPER-856
Fixes DEVELOPER-840 and Fixes DEVELOPER-856

Dantheman720/aweplug,awestruct/aweplug,LightGuard/aweplug,LightGuard/aweplug,awestruct/aweplug,Dantheman720/aweplug,wesbos/aweplug