Set default stability back to stable and make it optional

Manually merging #2300