Fixes #7416 - troubleshooting
Fixes #7416 - fixes addressing reviews
Merge pull request #42 from iNecas/issue/7416

Fixes #7416 - troubleshooting