Update branch

F****** GitHub merge conflict, so we do manually