Merge v1.3.5