Merge pull request #4828 from brancz/cherrypick-4826

Cherrypick 4826
2 jobs from v2.5.0 in 2 minutes 43 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Build
passed #144665
triggered
compile

01:37

 
  Package
passed #144666
triggered
container

01:05