Merge pull request #1540 from fluxcd/backport-1539-to-release/v1.7.x

Merge pull request #1540 from fluxcd/backport-1539-to-release/v1.7.x #3512