Started implementation of per-pool configs.
Merge branch 'origin/develop'