fixes after CR
Merge branch 'entity_collection_diff'