Adding final keyword to some classes and methods.
Merge branch 'refs/heads/develop'