Merge "Added fix for OOM-1966"