Merge "Add data type and policy type reference checking"