1.21.0
Update license headers
Changing code to use interfaces instead of implementations.
Minor refactorings and code style changes (#807)