Merge branch 'Story11_CurriculumSpacing'