Changes to ecco025 for long varun run
Merge branch 'devel' of https://github.com/brorfred/tracmass into devel