Adding new commits from luggage_projects