[HF 7.10.28] Cherry pick for CLDSRV-413

[tmacro]

It additionally cherry-picks some test changes that are not present, but needed.

[bert-e]

Hello tmacro,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

[bert-e]

Incorrect fix version

The Fix Version/s in issue CLDSRV-413 contains:

• 7.10.29

• 7.70.24

• 8.6.10

• 8.7.27

• 8.8.1

Considering where you are trying to merge, I expected to find at least:

• 7.10.28.1

Please check the Fix Version/s of CLDSRV-413, or the target
branch of this pull request.