DO-4875 and DO-4702 issues has been fixed.

DO-4875 and DO-4702 issues has been fixed.