Merge 5-2 stable into master (fixes guides, etc.) 

Fixes #4228 fixes #4171