cleanup stash
save errors history
Merge branch 'feature/cleanup' into develop
Merge branch 'release/v1.x'