Issue 4155 error pushing after upgrade from 2.5 to 2.5.1