Merge Single-Collapse branch for 1.3.0 release