Policy Policy Details: Merge fixes