Update from 1.x and 2.x to 5.x

Last updated