Athletics AotW changes
Merge branch 'Oct-16-1556'