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

Mergeback v3.29.6 refs/heads/releases/v3 into main #2984