[upstream] Track latest git sources