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

王权利请求将5-2-stable合并到master

Created by: bbodenmiller

Fixes #4228 (closed) fixes #4171 (closed)

合并请求报告