feat: added test and fixes for main

Closes #3607178

Merge request reports

Loading