migrate 2.6 > 2.5