Merge "Refactor OpenAPI Policy Executor"