mackup 0.5.8

Closes #26139.

Signed-off-by: Brett Koonce <koonce@gmail.com>
Merge remote-tracking branch 'upstream/master'