Issue #22551:handle param vend_id after mode
Merge pull request #297 from garyhgohoos/22551

Issue #22551:handle param vend_id after mode