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

Mergeback v3.28.14 refs/heads/releases/v3 into main #1273