Merge branch 'sonata_type_delete_validation_fix' into c_prod