Merge branch 'hotfix/3479'

Close #3479
Fixes #3454
[#3446] Allow generic traversable configuration to Captcha element
Forward port #3487