Merge final commits

Merge final commits on english branch