diff -r 536e421b082b -r 6a25c58a1c23 common/entity.py