Minor changes and updated file headers.
Merge remote-tracking branch 'origin/testing' into testing