editor fixes
Merge remote-tracking branch 'origin/api-wrapper' into mongo