klavaro 1.9.8

Closes #21961.

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