Substitutions matching fix#1611

lockshaw merged 3 commits intoflexflow:masterflexflow/flexflow-train:masterfrom

lockshaw:substitutions-matching-fixlockshaw/FlexFlow:substitutions-matching-fixCopy head branch name to clipboard