Merge "Adds yaml support in policy module"