Merge "Ignore test" into pi-dev