Add support for Version 9.6r1