Merged latest changes from armillz fork (IIS git path).