Fix conflicts to merge Develop in master