Update mapping logic

Closes #3579465

Merge request reports

Loading