editor updates
mergefix