Update Core to 3.7.1 //JHH