Resolve #3530149 "Revert changes 2024 004"

Closes #3530149

Merge request reports

Loading