merge v1.3