refactoring
refactoring
refactoring
refactoring
Merge remote-tracking branch 'upstream/master'
Fix merge conflict for Linux