Numerous fixes.
Merge branch 'hotfix/DS_TableShowingNonAliasNamesAfterWeek10'