Cleanups
Fix a copyright notice
Merge branch 'release/Test'