Merge "release notes for SO Guilin release"