Resolve "cherry-pick #522 into branch 5.0"

Closes #526 (closed)

Merge request reports

Loading