Merge branch 'choose-skills-and-interests'