Merge "Add support for config generation"