Merge "Extend tune workaround time." into pi-dev