Merge branch 'fix-indirect-dep-edge-cache' into 'master'

Fix indirect dep edge cache in var order checking (#127 on gitlab)

See merge request !227