updates for v9.5