refs #18608
Merge remote-tracking branch 'origin/bugfix/schedule-user-select'