Merge branch 'feature/er-restapi' into feature/er-structs
Saving work done on features/er-client
Merge branch 'feature/er-structs' into development