Generic changes to Performance project
Formatting tweaks
Formatting tweaks
Merge branch 'refs/heads/master' into cnstoll_performance