DO-5934 issue has been fixed.

DO-5934 issue has been fixed.