kawa 2.0

Closes #34737.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>