Mergeback v3.29.4 refs/heads/releases/v3 into main

Mergeback v3.29.4 refs/heads/releases/v3 into main #2861