inline mux
Merge pull request #1717 from Kenneth-T-Moore/meta

Inline the mux in multi_EI
Merge remote-tracking branch 'origin/dev' into dev