Stable 3609347

Ben Stallingsrequested to merge
issue/stable-3609347:stable-3609347 into 2.0.x

Merge request reports