Merge branch 'release/errorfix1'
fix forever error
Merge branch 'hotfix/errorfix2' into develop