Resolve #3537776 "Add support to"

Giusepperequested to merge
issue/panther-3537776:3537776-add-support-to into 1.0.x

Closes #3537776

Merge request reports