Fix multivar interface.
Merge remote-tracking branch 'xtao/multivar'