Add missing deriver support

Closes #3574357

Merge request reports

Loading