Merge "Fix timeout (switch to synchronous calls)"