Before 2.6 > 2.7 upgrade