Added fix for DO-4206