Draft: Resolve #3349676 "Add generic"

Closes #3349676

Merge request reports

Loading