Merge of crlfutf8 to development