Merge "More flexible API enforcement policy." into pi-dev