Applied changes from MR 14279

Closes #3566600

Merge request reports

Loading