BZ-1056490 - Fixed api with regards to timeout (milli)seconds