merge from hackweek_arabic (not finished yet, but merged early to avoid future merge conflict issues)