Resolve #3625091

Wolfgang Zieglerrequested to merge
3625091-custom-elements-3-5 into 3.x

Closes #3625091

Merge request reports