pull request from yw652