DO-5348 Bug has been fixed.