Whitespaces and StyleCop issues
Changed from extended attribute to Uuid property
Improved unit test
Merge branch 'rc/2.0.0' into develop