Draft: [No Commit] Issue #3439747: Adjustments to prepare for core inclusion

Closes #3439747

Merge request reports

Loading