re #10549 Fix warning
Merge branch 'feature/10549_Internet_Service' into develop