Resolve #3589129 "Various fixes for"

Closes #3589129

Merge request reports

Loading