Address coding standards; braces around if statements
Merge branch 'feature/WeakEventManager_Workaround' into personal