add timeout argument, part of MKWS-276