Changes, renames, refactoring
Merge remote-tracking branch 'origin/master'

Pulling changes from Linux