Automated cherry pick of #21876: Automated cherry pick of #21875: Automated cherry pick of #21804: [WIP] fix: add more action log

Automated cherry pick of #21876: Automated cherry pick of #21875: Automated cherry pick of #21804: [WIP] fix: add more action log #3601