Merge branch 'hotfix/4.0.5'
fix getDataForSave
Merge branch 'hotfix/4.0.6' into develop