Before unstash
Better resumption
Untracking config files
Retracking config files
Merge branch 'feature/BetterResumption' into develop