Merge "Update to new tcagen2 policy type"