fix: #3583190 Rollback BC breaking changes from MR 353

Closes #3583190

Merge request reports

Loading