kaihom cheng commit nov 22,2013