3.1-changes

Summary

Maintainability
Test Coverage