Merge branch 'hotfix'

tag v3.1.5
Merge branch 'fix-resume'
Merge branch 'master' into develop