Merge "Fix profile filtered loading" into pi-dev