Fixed merge errors (ADWD-906)