Merge "inputs to policy-handler blueprint"