- Removed unreachable code and unused using statement.
Merge branch 'release/2.0.0' into develop