[FAD-1704]