#FEC-1494 #comment adding flag for timeout