Issue #24385:set initial focus to order
Merge pull request #448 from garyhgohoos/24385

Issue #24385:set initial focus to order