Update crowsfoot from nairobilug upstream