Make sure that the shared state is used upon initialization, if it's already set.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	README.md