Jb nibbles

Cherry pick my commits, not cvds

these commit codes:
 	44f1ccd
	9b0f7dc