refs #235 - merge FB_EDITOR_IMPROMENTS