Merge "Correct provider filtering" into pi-dev