Merge pull request #1263 from soby-mathew/sm/dyn_config

Dynamic Configuration Prototype