Merge branch 'hotfix/new-resume'