[BISERVER-11205],[PRD-4858] - Needed reworking as pull-request merging did not see an earlier change.
Merge pull request #1421 from tmorgner/BISERVER-11205

[BISERVER-11205],[PRD-4858] - Needed reworking as pull-request merging d...