Merge "BugFix:correct context path in ND Ctx builder"