Fixed StyleCop violations
Merge commit '6fb7990fd9e6cdf17e30b9a08a97c50ca808dceb' into HEAD