Add options storage and retrieval capability.
Merge branch 'develop' into options
Merge branch 'develop' into options
Cache options.
Merge branch 'options' into develop