Merged changes from SESI for compatibility with Houdini 13.