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

...id not see an earlier change.