fix: Implement timeout layer correctly by using timeout (#4059)

fix: Implement timeout layer correctly by using timeout (#4059) #1365