Merge "Fix detected integer sanitization" into pi-dev