Merge "Always use safe labels" into pi-dev