Add support for 9.7 to 9.8r2