Add troubleshooting doc
Merge branch '1.6' into 1.7
Merge branch '1.7'