Merge "Draft of Config policy"