6.1.0 M5
[397429] Fix copyrights, imports
10 files changed