Fixing FxCop error
Merge branch 'release' into dev