Merge pull request #1554 from fluxcd/backport-1553-to-release/v1.7.x

Merge pull request #1554 from fluxcd/backport-1553-to-release/v1.7.x #3548