Repair typographical errors and inconsistencies
Merge branch 'repair_typographical_errors_and_inconsistencies'