Upgrade 2.3.7 and advice changes