Updating for v1.9 release (2)