Faster stabilize and tests cleanup.
merge conflicts.