next iteration for ep-core
next iteration for ep-web-client