stone 2.3e

Closes #17060.

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