Add troubleshooting information discovered in #946
Merge branch '946-troubleshooting' into develop