hotfix/resume: latest update on development branch