Option mutate returns bool

This is for #8047