Merge "4.6.0 policy-handler active-passive"