task: #3635355 Clean up ElementMultiple without changing behavior

Manuel Egíorequested to merge
issue/element_multiple-3635355:3635355-clean-up-elementmultiple into 1.x

Closes #3635355

Merge request reports