Athletics updates and fixes
Merge branch 'Aug-15-1027'