Prevent waiting for confirms unless selected
Update docs
Use less state
merge bug25356 into default