Manually merged in #1895

Also deleted Arabic Grids system since no longer needed.