Fix #167: Key-Value storage.
Merge branch 'dev-master' into site/crom

* dev-master:
  Fix #167: Key-Value storage.