Merge "default Enum name to None and don't remove given name" into main

diff --cc test/orm/declarative/test_tm_future_annotations_sync.py
Simple merge

diff --cc test/orm/declarative/test_typed_mapping.py
Simple merge