Update from wbond's repo