Merge "Automatic Config Policy Ui generation"