ref #6932 Fix new element handler and save
ref #6932 Migrate bulk editor handlers and add annotation merge support