Merge branch 'riversyang'