Resolve #3572249 "Fixes and test"

Closes #3572249

Merge request reports

Loading