Merge "Move tag definitions into policy"