Charset
Merge branch 'toolset-reorganization' into facorreia/azure