dart 31822

Closes #26035.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>