Progress commit
Merge branch 'vanilla' of https://github.com/sharedearth-net/sharedearth-net into vanilla