ice 3.5.1

Closes #23148.

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