Issue 5320 upgrade from 2.5.4 errors