Merge "[POLICY] Correction on PAP MR connection port"