Changes into 4.7 branch

Can't show this merge request because the source branch github/fork/stevekessler/patch-1 is missing from project documentation/docs/user-en. Close this merge request or update the source branch.