Pull request from Youyus.

Pull request from Youyus.