Draft: Resolve "cherry-pick #509 into branch 5.0"

Closes #511 (closed)

Merge request reports

Loading