backport 1.6.4 to HEAD

[techknowlogick]

As title

[codecov-io]

Codecov Report

Merging #5742 into master will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #5742      +/-   ##
==========================================
+ Coverage   37.75%   37.77%   +0.01%     
==========================================
  Files         325      325              
  Lines       47681    47681              
==========================================
+ Hits        18003    18010       +7     
+ Misses      27083    27080       -3     
+ Partials     2595     2591       -4

Impacted Files	Coverage Δ
models/unit.go	0% <0%> (-14.29%)	⬇️
models/repo_indexer.go	48.3% <0%> (+3.81%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d384c9...18884f3. Read the comment docs.

[jonasfranz]

#5669 is a security issue not a Bugfix.

[lafriks]

@jonasfranz it's too late to fix this in this PR