REsume was changed
Merge branch 'hotfix/ResumeEdition'

* hotfix/ResumeEdition:
  REsume was changed