Merge "Removing manual tap timeout wait" into main