for v1.8 release