Add timeout to client - fix for #7965 Upstream-commit: eb21197c6b4981db3cc2ad95694f92d723d34e2f Component: engine