Backport editor changes to helios