Merge branch 'passthrough-policies-priority'