Merge "blueprint for 4.5.0 policy-handler"