DO-4843, DO-4702 Bugs has been fixed.

DO-4843, DO-4702 Issues has been fixed.