module id contains alternative path index if >0
Merge branch 'master' into edge