Merge master and fix conflicts