Ubuntu commit
Merge branch 'ubuntu'
Resolve conflict