Add patch to fix a panic with VIMAGE+LAGG