Instrument manager fixes
Merge branch 'atom/enaml' into control_panel