fix(core): prepare merge
Merge branch 'dev'

Conflicts:
	README.md
fix(core): fix server