Merge pull request #1677 from ok300/ok300-patch-1