review changes for 3.1.5