Try and cover both 10.5 and 10.6

Stephen Mustgraverequested to merge
issue/rules-3563101:3563101-maintain-both into 4.0.x

Closes #3563101

Merge request reports