Resolve #3571199 "Prevent duplicate validation"

Lothar Ferreira Neumannrequested to merge
issue/decorative_images-3571199:3571199-prevent-duplicate-validation into 1.x

Closes #3571199

Merge request reports