Added fix DO-4490