Cherry-pick-2997dca7 into '15-2-stable-ee'

What does this MR do and why?

This MR applies !101434 (merged) bugfix to 15.2 stable version.

Note: We need to trigger e2e:package-and-test pipeline job manually before merging.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.