stabilize -Znext-solver=coherence again
#130654
Merged
-Znext-solver=coherence again
#130654