Resolve #3354811 "Compatability with guardian"

Closes #3354811

Merge request reports

Loading