Merge "End-to-end policy CSIT"