grc 1.5

Closes #21833.

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