Reconcile jf with themuppets

Change-Id: I0c3d10d04cb384ff6b512a47285ba18ebe7b20c9