gist 4.0.3

Closes #19832.

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