Merge "Making test as flaky test" into main