block: update with upstream v6.0

Merge request reports

Loading