Merge 1.3.1 to 1.3.0