Improving the compare_entities functions See merge request !103
mentioned in commit 5d81222a
mentioned in commit 14f167b5