Implement on 3.0.x

Alex Pottrequested to merge
issue/shs-3359851:3359851-3.0.x into 3.0.x

Closes #3359851

Merge request reports