3582789: Fix tests against 11.4.x

Shubham Goelrequested to merge
issue/metatag-3582789:3582789-fix-tests-against into 2.2.x

Closes #3582789

Merge request reports