Adopting XLS Templating. Introduce DB based configuration
Merge origin/master