3rd branch ubuntu change
pull from master in 3rd branch and resolve conflict
3rd finished