Final Push to go back into main

This is the final push back into main. I did have some issues with getting stylecop to resolve all issues but there was nothing more I could have done to resolve them as they either complained about things out of my control or asking me to fix files that I didn't modify.