Merge pull request #2767 from kuoruan/yaaw