Merge branch 'add-troubleshooting-info' into 'develop'