Update jet branch

Change-Id: I9be3968ab24e3a862aa51585cee12006b2aa4ac7