merge v1.18