[Components][Security] Fix #3708
bug #3709 [Components][Security] Fix #3708 (bicpi)

This PR was merged into the 2.3 branch.

Discussion
----------

[Components][Security] Fix #3708

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | #3708

Commits
-------

da025b1 [Components][Security] Fix #3708