Apply fixes from core

Closes #3501227

Merge request reports

Loading