Merge from Crlfutf8 to development