Made TIMEOUT public as requested by issue-358