3.9.0 annotation merge

Merge the option to save the annotation without closing the editing UI