Merge branch 'backport-3.20-makefile-normalize-depfile' into release-3.20

Merge-request: !6297