Merge v1.3.1 with Master