Merge "@ignore flaky test" into pi-dev