re #7324 reverse previous change as it did not work.

Now trying to perform overriding of both overloaded virtual methods to see if that fixes the warning.
Merge branch 'feature/7324_warningHunt' into develop