Merge "Fix for defect 4135"