Agpush 858

make modern hibernate happy