Fix problems with RBC batch import (RT#6967)