Merge "Add hasUnwantedCapability method" into pi-dev