[2.1] sub-requests are now created with the same class as their parent#7381