addClassExchangeEntity
Merge remote-tracking branch 'origin/entities'