Resolve #3556790 "Move legacy and"

Closes #3556790

Merge request reports

Loading