Merge branch 'f-bug-fit-94-compare-properties-with-id' into 'dev'

Compare_entities diff uses id instead of name where needed

See merge request !165