Merge branch 'maddoger-sportbox-fix'