modified according to 5.27.docx
Merge branch 'master' into no-no-reload