Remove base index for muxinator compat
Merge with master