merge editorial_fixes to 5.1