feat #3566801 Add the helper & fix known use cases

Closes #3566801

Merge request reports

Loading
Loading