Merge pull request #870 from nupplaphil/task/dyn_config