Add short name support for xml data generation
Code formatter update
Merge from branch "master "