Resolve #3484827 "Refactor callback 3.1.x branch"

Related to #3484827

Merge request reports

Loading