Merged just to create a common ancestor. No actual changes on v1.65 found (other than irrelevant change in generated html of manual)