Add support for versions up to 9.8r2