merge from open-source master
tree: 237db055442ca4a87c03b0884513480f9b78967f
  1. policy/