Resolve #3561038 "Beta fixes 2"

Closes #3561038

Merge request reports

Loading