dart 20602

Closes #18790.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>