Merge "Add unstable tag to test with intermittent failures"