Resolve #3302507 "Try 2"

Open Nicholas Stees requested to merge issue/o365-3302507:3302507-try-2 into 3.0.x

Closes #3302507

Merge request reports