Merge branch 'hotfix/teams-ordering'
Merge branch 'release/1.5.3'
Fix up tests and add an extra check to milestone validation
Merge branch 'hotfix/milestonetests' into develop