Migrated to 3.0 #3698