Close 6.1.0-public branch, merged.