dart 28355

Closes #23242.

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