shyanfeng part merge with maintainer james

james please accept my request