Language fix and corrections for pre-delivery (still some missing sections)
Merge conflict