Merge origin/master and fix conflicts