BZ-1056490 - Fixed api with regards to timeout (milli)seconds
(cherry picked from commit a174abea7afe15f41a9e14d36c3266ebc7fb7429)