Merge "[AAI-174 Amsterdam] removed invalid edge rules"