Added defect: D-16424