Merge "add support for config generation"