re #7040 remove irritating warning
Merge remote-tracking branch 'origin/feature/7040_removeWarning'