Add official support for version 9.4